Add sorting
Remove a debug statement