Minor cleanup and formatting.