Updated a bunch of things' formatting