Renamed some ugly variables