Simplify demo code