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