Refactor and cleanup model mixins.