Refactoring. Yaaay TDD