Cleanup and a couple examples