Fix up comments and white space
Fix up more whitespace