drone: further refactor to use options dict instead of globals