Continue Refactoring