improve and simplify entry point

Change-Id: Icbe7bdf92f5d3425158ffb9e37803f790e82977c