cdh@vcloud: incorporate review comments