Tests: Refactoring.
Refactoring: Improved code readability.