some hlint suggestions