Renamed variables and added getters