More refactoring

Change-Id: I531c1911d7d627eeb799199ad69c0e30d15d4d6e