Cleaning code+refactoring 

Signed-off-by: bessem <bessem@esprit.com>