Refactoring

Change-Id: I9199e4c443684e9cbb8ca0513eae26f2bf16bdf1