Minor cleanup
New class script (should have done that long time ago)
Skipping iterator