Code reformat to please @dmillerw