More comment cleanups