Improve readability of demos