clean up comments and formatting.