Cleans up model attributes a bit.

From @ericecook