Refactoring for readability
Refactoring continuation