Fix sniffed out whitespace issues