Renamed some variable names