refactoring
$lia done !