refactoring

Change-Id: Icecc81e225ae1f1fff4f6dd39b6e6db12563d0ac