Move model rendering out to model class