Refactoring continues..