Work on cleaning up the example scripts