more refactor

Change-Id: I9e97e352fd90f3696fe808fbd2a71c231517e876