Last commit (I hope) and big clean up. 25/25 tests green !