MInor refactoring.