Refactor: Tidy up default options
easier to demo