Moved options to variables