Refactoring ...