#115 Renamed variables to reflect private scope