Examples cleanup

Minor updates