Code cleanup
More informative demo