code cleaning

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