Renamed a few variables to better names