Refactor writers