Changes to clean up confusing examples