Refactor reindexing and strategy classes