Comments/code cleanups