Addressing additional comments from openstack community