Variable refactor