Reformat to new style