Cleanup+Reformat