implement hlint suggestions