Remove extra spaces (again)