Clean up comments and names.