Refactoring reverted