Update demo files. A minor code cleaning.