hlint refactorings