Reformat code using new style.