Renamed some horrible variables