Refactored response