refactor

Signed-off-by: Cherif Mahdi <Cherif Mahdi@172.16.2.2>