Implement hlint suggestions