clean up comments a bit