variable refactor