review comments v2

Signed-off-by: Nick Desai <ndesai36@bloomberg.net>