Added individual metrics opt-out option
renamed some not so constant variable names