Fix some spacing issues

Don't place spaces where they aren't wanted.