NFC refactoring

Change-Id: I39757f3a2b60c7df14740bf75048b89375b4dca3