comment cleanups