refactoring

Change-Id: I5de4250db7e7b88702e8e3e2f114f66508efa23d