Clean up options struct and options handling