More minor changes (hlint)