fix bug on demo task
clean code