Refactorings
Refactored