Reformatted all to prevent future reformat commits