Tidied up the Index module