* Improve demo readability