Refactor Model methods to reduce complexity