Refactor public NextWriter