Style tweaks.
Minor refactoring.