Fix all the spacings. I don't care which we go with, but let's be consistent.