Even more formatting changes

Last commit until July 3rd :)