Refactored Output