Third round of fixing whitespace