Simplification implemented, traverse exchanged with generators