Make options struct local rather than global