Comments and code cleanups