more comment cleanups