Additional comment cleanups