Renamed some locals