code cleaning

Change-Id: Ia7626f8344d5f8fc6075e53bf1475143a93cfe5a
Signed-off-by: Jean Chassoul <chassoul@gmail.com>