hlint suggestion fixes