Minor formatting update
Adding an iterator: doomed approach since the parts are split across files; will need another hash instead