Fixed typo.
Executed "Reformat code".
Some more CS fixes.