cleanup, run through hlint