Changing to iterators for Planet Manager