Fix inconsistent letter casing.
Fix a warning.
Whitespace and formatting fixes.