code cleanup

Change-Id: I694ff82bf25ed282f6480858523fc239b2db76c9