Minor refactoring.
Minor refactor.
Minor refactor.