Fix some of the crazy formatting