minor renaming
refactor default options