Minor clean up and reformat