Comments and cleanups.