folded in formatting updates from ypg2yui3