Refactoring:x