refactored models to use keys to prevent formatting inconsistencies