refactor new variables