Refactor vcloud_query code to be easier to follow