refactor code, remove "demo_" prefix