ivar2: Clean up loop usage
ivar2: Stop using main loop