Comment cleanups