Refactoring continues...