Cleaning up default option handling