Move draw routines into individual demos