Code comments and cleanups