A bit of refactor and Fortre implementation.
Renaming + better implementation for an iterator + additional mapping utilities.