Tiny cleanup changes for models