That's better. Some much needed refactoring and clean up with respect to Main.hs