Cleanup
Added more examples