small refactoring

Change-Id: I361cf44bb5d355d8dc5ba9696e26057aedade3ba