some comments / refactoring

refactoring is a little bit more important this time than previous
commit.

I created a new method to manage 3 differents nearly identical methods
but for the moment, the methods called are still the old one, the new
one is just sitting here waiting for approval