Neutral refactoring