refactor to quasi-better variable names