style cleanup, coherent 'demo' class