Refactor Variable Value Definition