Some refactoring
Cabal freeze