refactoring

Change-Id: Icca2fa86e8995859612a1e98309c914913b0f304