review 2

Signed-off-by: Zell Liew <zellwk@gmail.com>