minor improvements in ModelUtil