diff --git a/README.md b/README.md
index b1f4453..53c016d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 This is the Haskell MongoDB driver (client). [MongoDB](http://www.mongodb.org) is a free, scalable, fast, document database management system. This driver lets you connect to a MongoDB server, and update and query its data. It also lets you do adminstrative tasks, like create an index or look at performance statistics.
 
 ### Documentation
-* [Quick example](http://github.com/TonyGen/mongoDB-haskell/blob/master/doc/Example.hs)
-* [Tutorial](http://github.com/TonyGen/mongoDB-haskell/blob/master/doc/tutorial.md)
+* [Quick example](http://github.com/selectel/mongoDB-haskell/blob/master/doc/Example.hs)
+* [Tutorial](http://github.com/selectel/mongoDB-haskell/blob/master/doc/tutorial.md)
 * [Driver API](http://hackage.haskell.org/package/mongoDB)
-* [MapReduce example](http://github.com/TonyGen/mongoDB-haskell/blob/master/doc/map-reduce-example.md)
-* [Driver design](http://github.com/TonyGen/mongoDB-haskell/blob/master/doc/Article1.md)
+* [MapReduce example](http://github.com/selectel/mongoDB-haskell/blob/master/doc/map-reduce-example.md)
+* [Driver design](http://github.com/selectel/mongoDB-haskell/blob/master/doc/Article1.md)
 * [MongoDB DBMS](http://www.mongodb.org)
diff --git a/doc/Example.hs b/doc/Example.hs
index 82a87a5..9908cff 100644
--- a/doc/Example.hs
+++ b/doc/Example.hs
@@ -1,14 +1,19 @@
 {-# LANGUAGE OverloadedStrings, ExtendedDefaultRules #-}
 
-import Database.MongoDB
+import Database.MongoDB    (Action, Document, Document, Value, access,
+                            close, connect, delete, exclude, find,
+                            host, insertMany, master, project, rest,
+                            runIOE, select, sort, (=:))
 import Control.Monad.Trans (liftIO)
 
+main :: IO ()
 main = do
     pipe <- runIOE $ connect (host "127.0.0.1")
     e <- access pipe master "baseball" run
     close pipe
     print e
 
+run :: Action IO ()
 run = do
     clearTeams
     insertTeams
@@ -16,18 +21,24 @@ run = do
     nationalLeagueTeams >>= printDocs "National League Teams"
     newYorkTeams >>= printDocs "New York Teams"
 
+clearTeams :: Action IO ()
 clearTeams = delete (select [] "team")
 
+insertTeams :: Action IO [Value]
 insertTeams = insertMany "team" [
     ["name" =: "Yankees", "home" =: ["city" =: "New York", "state" =: "NY"], "league" =: "American"],
     ["name" =: "Mets", "home" =: ["city" =: "New York", "state" =: "NY"], "league" =: "National"],
     ["name" =: "Phillies", "home" =: ["city" =: "Philadelphia", "state" =: "PA"], "league" =: "National"],
     ["name" =: "Red Sox", "home" =: ["city" =: "Boston", "state" =: "MA"], "league" =: "American"] ]
 
+allTeams :: Action IO [Document]
 allTeams = rest =<< find (select [] "team") {sort = ["home.city" =: 1]}
 
+nationalLeagueTeams :: Action IO [Document]
 nationalLeagueTeams = rest =<< find (select ["league" =: "National"] "team")
 
+newYorkTeams :: Action IO [Document]
 newYorkTeams = rest =<< find (select ["home.state" =: "NY"] "team") {project = ["name" =: 1, "league" =: 1]}
 
+printDocs :: String -> [Document] -> Action IO ()
 printDocs title docs = liftIO $ putStrLn title >> mapM_ (print . exclude ["_id"]) docs