Remove hlint warnings