Code refactoring ...