fix up comments and whitespace