448156 Fixed INACTIVE race in IteratingCallback

More code cleanups and review