[Update]: cleaned code and fix demo.