CHG better variable names, fixed import