Renamed minor variables