better demo + cleanup