Be consistent with commas
Whitespace
Whitespace
Other minor corrections