Remove some extra whitespaces