cleanups, mostly thanks to hlint
slight further cleanups