Minor code cleanup and formatting.