code cleanup #15

Change-Id: Iedcc78893a2f6014a48e96137e8baef74e6fe50a