Additional refactoring.