More refactoring

Change-Id: Idb9d85ff45126cd695b7b4e1fe9fb9d2d59134c2