Remove some extra spaces