Some small cleanups
Some small cleanups