uml: style fixes pass 1