Minor refactoring.
Minor refacoring.