Improved demo formatting