That extra mile
Deleted useless comments
Adaptation redone based on specialization

Crashing in icode :(