Clean up and included code samples.  I initially used these to test.