Refactoring ...
Refactoring