Full itors refactoring