Clean up default opts logic