Fixed code format problems.

Also Title Case.