Remove space issues