Fixed style and .cabal file issues