Renamed some vars to be more descriptive