Fixed some review comment
Signed-off-by: Hin C Lam <hincheuk@us.ibm.com>