refactoring

Change-Id: I48cfe3ba481c015117b65533d15160a6439ee163