tiny cleanup, inverted conditions, etc