More tiny cleanup