1, Refactoring