whitespace/formatting cleanup
clean up .cabal file
some cleanup/reorganization