Refactoring (hlint)