Cleanup and add a nicer way of setting default options