Simplify code for Dare2BDigital demo