Formatting changes

Messed with a bunch of stuff. Broke most of it.