Refactoring continues #2