Indexer code cleanup. Started on server side index file store.