Moved stray options to options object