Sorting fixed
Cleanup debug data