Remove some evil spaces