Some cleanup in examples