Refactoring
Refactored