Added remove spaces