WIP (W): Refactoring in action