Clean up and add some handy indexes

cc @Sirupsen