Refactor - Improve defvar definition