1er refactoring²
various