cleaned up to dicts to be more legible so pymodelint doesn't scream