Small refactoring
Refactoring
Yet another refactoring, namespaces sequence and map2d