Some spurious spaces deleted