Output refactor.