review feedback

Signed-off-by: Huamin Chen <hchen@hchen.csb>