Clean up client code to make demo clear