Renamed some variables to make the code still more pythonic.