Refactor Output