Refactored
Refactoring