Tightened up whitespace to shorten some long lines