Clean up comments and formatting.