Add more improvements.

Signed-off-by: cctsao1008 <chiacheng.tsao@gmail.com>