Made index + a little more tidying up