changed variable names to be consistent style