Refactoring.
Refactoring.
Improved readability.