comments and cleanups