Complete Reformat and Fixes