refactoring/improvement

comme promis