6model: more banal codingstd improvements