Refactoring

Change-Id: Ib7098f6ca38b4fc8c35d5bfe71f8925848ac9b8a