refactor model specs