diff --git a/src/Orbit-wise.jl b/src/Orbit-wise.jl
index 681aa9c..fa131a3 100644
--- a/src/Orbit-wise.jl
+++ b/src/Orbit-wise.jl
@@ -1,14 +1,7 @@
-using JLD
 using JuMP
 using SCS
 
-using GroupRings
-using PropertyT
-
-using ValidatedNumerics
-using ArgParse
-
-import Nemo: Group, GroupElem
+export Settings, OrbitData
 
 immutable Settings
    name::String
diff --git a/src/PropertyT.jl b/src/PropertyT.jl
index 4da5c3d..3f4f4d6 100644
--- a/src/PropertyT.jl
+++ b/src/PropertyT.jl
@@ -1,11 +1,15 @@
 module PropertyT
 
-using JLD
-using GroupRings
-using Memento
-
+using Nemo
 using Groups
-import Nemo: Ring, Group, GroupElem
+using GroupRings
+
+import Nemo: Group, GroupElem, Ring
+
+using JLD
+using JuMP
+
+using Memento
 
 const logger = Memento.config("info", fmt="{msg}")
 const solver_logger = Memento.config("info", fmt="{msg}")