Reformatted code

The build works, but I haven't checked every auto-formatted file