Demo formatting tweaks