code improvements

Change-Id: Ib6e5342108042b8c3baa81a316659794d516b989