Minor refactoring.
Minor code reformatting.