added the removal of spaces