Demo style improvement