A bit of code cleanup and formatting.