Refactoring in progress