various hlint cleanup