improve variable names