Update after reviews.
Lots of configuration harmoized
Iterator unused in various places