refactoring

Signed-off-by: o.pitton <olivier.pitton@gmail.com>