Continue cleaning up the example scripts