Renamed a few variables