Put defvar in correct place