refactoring

Change-Id: Ib82b087e34ac766f97ce297240666c9b7d505d3e