Demo formatting improvements