Refactored SortField to remove string parsing