Renommage en vue de la conversion
Code refactoring
Code refactoring again, but don't work x_x