tidying + haskell deps 1st draft