back to cabal, cabal-dev seems broken
minor style cleanup