Cleaning up the models and adding field indexing to appropriate fields.