Refactoring: continued
Refactoring
Refactoring