#update - model - minor refactor