hlint refactorings

only hlint, no functional changes.