More hlint changes