Fixed a bunch of inconsistent spacing