cosmetic tweaks in EntryPoint