Tiny cleanup
More tiny cleanups