Just a few code reformats