More code reformatting