Clean code
Signed-off-by: Zhou,Chang <achang.zhou@gmail.com>