refactor iterators
clarify class, module and namespace