fixed variable names to be clearer