Renamed some local variables