Refactoring.
Refactored.