Reformat and clean up