Normalized data

Ran the data through Data Indexer to make sure it's up to date
structurally