Refactoring and cosmetic changes to ext-inter expt Change-Id: Icd457480744b7734b3c412c9fed43be738373334