code cleaning

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