streamlined code

removed _EntryIndex (it's not needed)