Refined some demo example code.