refactor content in outputs