Replaced two magic indexes with proper names