Minor reformat and clean up