Comments and cleanups