Get rid of some more temporary variables
Index is not needed