diff --git a/Ledger.hs b/Ledger.hs
index f5586b984..9f57d985f 100644
--- a/Ledger.hs
+++ b/Ledger.hs
@@ -20,7 +20,6 @@ module Ledger (
               )
 where
 import qualified Data.Map as Map
-
 import Ledger.Types
 import Ledger.Currency
 import Ledger.Amount
diff --git a/Ledger/Amount.hs b/Ledger/Amount.hs
index 9cdadbe20..3c37ff3c7 100644
--- a/Ledger/Amount.hs
+++ b/Ledger/Amount.hs
@@ -42,6 +42,7 @@ import Ledger.Utils
 import Ledger.Types
 import Ledger.Currency
 
+
 tests = runTestTT $ test [
          show (dollars 1)   ~?= "$1.00"
         ,show (hours 1)     ~?= "1h"      -- currently h1.00
diff --git a/Ledger/Ledger.hs b/Ledger/Ledger.hs
index 945c83b86..87987f503 100644
--- a/Ledger/Ledger.hs
+++ b/Ledger/Ledger.hs
@@ -8,22 +8,7 @@ providing the filtered entries & transactions.
 
 -}
 
-module Ledger.Ledger (
-cacheLedger,
-filterLedgerEntries,
-accountnames,
-ledgerAccount,
-ledgerTransactions,
-ledgerAccountTree,
-addDataToAccountNameTree,
-printentries,
-printregister,
-showLedgerAccountBalances,
-showAccountTree,
-isBoringInnerAccount,
-isBoringInnerAccountName,
--- pruneBoringBranches,
-)
+module Ledger.Ledger
 where
 import qualified Data.Map as Map
 import Data.Map ((!))
diff --git a/Ledger/Parse.hs b/Ledger/Parse.hs
index 667ee86b2..5b9b91d53 100644
--- a/Ledger/Parse.hs
+++ b/Ledger/Parse.hs
@@ -11,13 +11,13 @@ import Text.ParserCombinators.Parsec
 import Text.ParserCombinators.Parsec.Language
 import qualified Text.ParserCombinators.Parsec.Token as P
 import System.IO
-
 import Ledger.Utils
 import Ledger.Types
 import Ledger.Entry (autofillEntry)
 import Ledger.Currency (getcurrency)
 import Ledger.TimeLog (ledgerFromTimeLog)
 
+
 -- utils
 
 parseLedgerFile :: String -> IO (Either ParseError RawLedger)
diff --git a/Ledger/RawLedger.hs b/Ledger/RawLedger.hs
index 9a3940747..7f2b552a0 100644
--- a/Ledger/RawLedger.hs
+++ b/Ledger/RawLedger.hs
@@ -8,7 +8,6 @@ the cached 'Ledger'.
 module Ledger.RawLedger
 where
 import qualified Data.Map as Map
-
 import Ledger.Utils
 import Ledger.Types
 import Ledger.AccountName
diff --git a/Ledger/TimeLog.hs b/Ledger/TimeLog.hs
index 3e82a5b04..eee3eb720 100644
--- a/Ledger/TimeLog.hs
+++ b/Ledger/TimeLog.hs
@@ -8,7 +8,6 @@ containing zero or more 'TimeLogEntry's. It can be converted to a
 
 module Ledger.TimeLog
 where
-
 import Ledger.Utils
 import Ledger.Types
 import Ledger.Currency
@@ -17,6 +16,7 @@ import Ledger.RawTransaction
 import Ledger.Entry
 import Ledger.RawLedger
 
+
 instance Show TimeLogEntry where 
     show t = printf "%s %s %s" (show $ tlcode t) (tldatetime t) (tlcomment t)
 
diff --git a/Ledger/Types.hs b/Ledger/Types.hs
index 069fc91a2..de2a5e387 100644
--- a/Ledger/Types.hs
+++ b/Ledger/Types.hs
@@ -10,6 +10,7 @@ where
 import Ledger.Utils
 import qualified Data.Map as Map
 
+
 type Date = String
 
 type DateTime = String
diff --git a/Ledger/Utils.hs b/Ledger/Utils.hs
index d7080b8d6..afe0554d6 100644
--- a/Ledger/Utils.hs
+++ b/Ledger/Utils.hs
@@ -16,7 +16,9 @@ module Text.Regex,
 module Debug.Trace,
 module Test.QuickCheck,
 module Test.HUnit,
-defaultTimeLocale, UTCTime, diffUTCTime, parseTime, formatTime,
+module System.Locale,
+module Data.Time.Clock,
+module Data.Time.Format
 )
 where
 import Char
diff --git a/Options.hs b/Options.hs
index 8679e928f..d774f57dc 100644
--- a/Options.hs
+++ b/Options.hs
@@ -1,19 +1,10 @@
-module Options (
-Opt(..), 
-usage, version,
-parseArguments, 
-ledgerFilePathFromOpts,
-beginDateFromOpts,
-endDateFromOpts,
-parseAccountDescriptionArgs,
-)
+module Options 
 where
 import System
 import System.Console.GetOpt
 import System.Directory
 import System.Environment (getEnv)
 import Data.Maybe (fromMaybe)
-    
 import Ledger.Utils
 import Ledger.Types
 
diff --git a/Setup.hs b/Setup.hs
index a6a22c8ee..1f13f5e0f 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,3 +1,4 @@
 #!/usr/bin/env runhaskell
 import Distribution.Simple
-main = defaultMain
\ No newline at end of file
+
+main = defaultMain
diff --git a/hledger.hs b/hledger.hs
index 9eeaf847f..3fa41a5ef 100644
--- a/hledger.hs
+++ b/hledger.hs
@@ -34,12 +34,11 @@ module Main
 where
 import System
 import qualified Data.Map as Map (lookup)
-
 import Options
-import Tests (hunit, quickcheck)
-import Ledger.Parse (parseLedgerFile, printParseError)
-import Ledger.Utils hiding (test)
-import Ledger hiding (rawledger)
+import Tests
+import Ledger.Parse
+import Ledger.Utils
+import Ledger
 
 
 main :: IO ()
@@ -99,15 +98,15 @@ parseLedgerAndDo opts args cmd =
 
 -- | get a RawLedger from the file your LEDGER environment variable points to
 -- or (WARNING) an empty one if there was a problem.
-rawledger :: IO RawLedger
-rawledger = do
+myrawledger :: IO RawLedger
+myrawledger = do
   parsed <- ledgerFilePathFromOpts [] >>= parseLedgerFile
   return $ either (\_ -> RawLedger [] [] [] "") id parsed
 
 -- | as above, and convert it to a cached Ledger
-ledger :: IO Ledger
-ledger = do
-  l <- rawledger
+myledger :: IO Ledger
+myledger = do
+  l <- myrawledger
   return $ cacheLedger wildcard $ filterLedgerEntries "" "" wildcard wildcard l
 
 -- | get a Ledger from the given file path
@@ -118,5 +117,5 @@ rawledgerfromfile f = do
 
 -- | get a named account from your ledger file
 accountnamed :: AccountName -> IO Account
-accountnamed a = ledger >>= (return . fromMaybe nullacct . Map.lookup a . accounts)
+accountnamed a = myledger >>= (return . fromMaybe nullacct . Map.lookup a . accounts)