Tidying imports and cabal file