refactored setting of default options