added some hlint suggestions