Refactoring outputs