refactoring

Change-Id: Ib735b3d0724d327bdefff84717a9af86aeb66477