More refactoring

Change-Id: Id7a89b02158120707b31770a837cbb6bdadce0a2