some small suggestions for cleanups in comments