Refactor. Covered refactor in tests.