Reformat code; diff style.