Refactoring

Change-Id: I737136f38376efde2773871d95b5706f959820b4