refactoring

Change-Id: Ic33db299f402a7d2e7df1addf84f24894bbc93c7