follow some hlint suggestions