Refactoring: Better separation of functions.
Refactoring: Better separation of functions.