Refactoring intensifies