Refactoring.
Refactoring