Reformat and Cleanup