some more refactor

Change-Id: If79c861a681981d65b70a15817e59c0862e3fe46