Renamed some variables more sensibly