More refactoring towards single pass