Smell refactoring