Minor refactoring.
Minor refactoring.