[Minor] minor cleanups