Cross products, table iterators, refactoring to modules