Improve printing of model