Cleanup
Cleanup
Cleanup + fixes bug for comparaison

It was sorting increasingly
Debugging tool was buggy....