hlint suggested improvements