Make some examples a little cleaner and more modern