code cleaning

Change-Id: I13342405735b79363b9a981240670510bf4818ba