Renamed variables and exposed more in module