some tweaks from hlint