Refactor

Originally, the intention behind the duplicated code between demos was that each demo could standalone and be didactic. While the agent code (though similar) should remain standalone, we should minimize the duplicated code in the scaffoldings. 