code cleaning

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