Clean comments cleanups