Reformat and fixed