code clean up

Change-Id: I0c18b2a4f38744a09214a676cc1f5b9245c6b275