Some simple code reformatting