Minor formatting changes I think, should be pretty much done anyways