Deleted SortWithSpaces and SortWithoutSpaces classes
Refactored code