Another set of refactoring.