cleaned up demo init