...more refactoring...almost there...

Change-Id: I6876fcf1d5e642c0ba720c850d8474708374452e