refactor model things