Passed tests.
Refactoring.