Reformat and Refactor