Refactoring #1
Refactoring #2