Clean up GHC warnings and style