some fixes to hlint suggestions