slightly clean up model functionality