Renamed some variables and a function.