Blocks index finishing off and refactoring