tiny cleanup changes