R4: More refactor progress