Refactor models

Standardize on new hash syntax across models. Add line breaks to keep
lines below 80 cols.