Renamed variables and made comments PEP8 compliant