Refactoring

Change-Id: Ib242e0f66a79ec1eff0aac43b5ebe779c0c8880b