..refactoring continues...