Updated code formatting
Reformatted, regenerated everything