Minor code reformating