code cleanup

Change-Id: Ib28a50e325359b01e00f77b7c71f7aadc4390a0e