Refactored echo