variable system refactor completed