Whitespace corrections

Correct whitespace issues in the source code and add a few commas.