Fixing a bunch of screwed up spacing [ci skip]