Reformat, rearrange code broke it. Recommit the code without them