fixed some hlint suggestions