Tiny cleanup
Further tiny cleanup