refactor: unifying response data manipulation