Refactor Model methods to reduce complexity

No match.