More work on axing extra spaces

Yay for nitpicking!