Continuing the refactoring