Refactoring to allow better indexing names