Clean up comments a bit