Cleaned up the Main.hs a bit