Continued the refactoring.