Minor tweak to creation of model instances
Simplify model by pushing code up to calling methods. Candidate for further refactoring.