Implement hlint's suggestions