Renamed some array indexes
Refactoring