Moved options into separate method