Refactor Openstack client