Cleaneup a little more examples