more performance tuning with indices and standardized naming conventions