Refactoring

Change-Id: I280a0fcb1872b8c43b8925d76369a49c8a88a115