Refactoring and cleanup + Indexer + Convert