Refactored access to current index