Some code reformatting.