OVS review

std::string?