Cleaning up
Demonstration sketch