Cleaned up Indexer code
Cleaned up Indexer code
Merged Andrew into Master