more minor cleanups in comments