Improve cosmetics
Refactor use of Cabal