Some unneded spaces fixed