model: cosmetic output improvements