Refactoring, tests.