reformat for new style standard