Some minor cleanups.
Some minor cleanups.