More refactoring...

Change-Id: Idcbfdb7db58dc45d2940e96661b22a3fe60ced61