diff --git a/telegram_inference_bot.py b/telegram_inference_bot.py
index dfb2692..b1ef7fe 100644
--- a/telegram_inference_bot.py
+++ b/telegram_inference_bot.py
@@ -86,7 +86,7 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
             
             tool_response = call_tool(tool_call)
 
-            formatted_result = {"role": "function", "name": function_name, "content": json.dumps(tool_response)}
+            formatted_result = ai_provider.format_tool_result(tool_call, tool_response)
             messages.append(formatted_result)
 
             response = ai_provider.get_chat_response([{"role": "system", "content": system_prompt}] + messages)
@@ -95,14 +95,13 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
             toolUseCount += 1
 
         if toolUseCount == 0:
-            assistant_reply = response.content[0].text if isinstance(ai_provider, AnthropicProvider) else response.choices[0].message.content
+            assistant_reply = ai_provider.format_assistant_reply(response)
             conversation_history[user_id].append({"role": "assistant", "content": assistant_reply})
         
         if len(conversation_history[user_id]) > 20:
             conversation_history[user_id] = conversation_history[user_id][-20:]
 
-        reply_text = response.content[0].text if isinstance(ai_provider, AnthropicProvider) else response.choices[0].message.content
-        await update.message.reply_text(reply_text)
+        await update.message.reply_text(ai_provider.get_reply_text(response))
 
     except Exception as e:
         logging.error(f"An error occurred: {str(e)}")
@@ -117,31 +116,20 @@ def call_tool(function_call):
 
 async def switch(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     global ai_provider
-    if isinstance(ai_provider, OpenAIProvider):
-        ai_provider.use_smart_model = not ai_provider.use_smart_model
-        ai_provider.model = ai_provider.get_model()
-        logging.info(f"Switched to model: {ai_provider.model}")
-        await update.message.reply_text(f"Switched to model: {ai_provider.model}")
-    else:
-        await update.message.reply_text("Switching models is only available for OpenAI provider.")
+    model = ai_provider.switch_model()
+    logging.info(f"Switched to model: {model}")
+    await update.message.reply_text(f"Switched to model: {model}")
 
 async def switch_providers(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     await clear(update, context)
     global ai_provider
-    if isinstance(ai_provider, AnthropicProvider):
-        ai_provider = create_ai_provider("openai")
-        logging.info("Switched to OpenAI provider")
-        await update.message.reply_text("Switched to OpenAI provider")
-    else:
-        ai_provider = create_ai_provider("anthropic")
-        logging.info("Switched to Anthropic provider")
-        await update.message.reply_text("Switched to Anthropic provider")
+    new_provider_name = "openai" if isinstance(ai_provider, AnthropicProvider) else "anthropic"
+    ai_provider = create_ai_provider(new_provider_name)
+    logging.info(f"Switched to {new_provider_name} provider")
+    await update.message.reply_text(f"Switched to {new_provider_name} provider")
 
 async def status(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    if isinstance(ai_provider, AnthropicProvider):
-        await update.message.reply_text(f"Currently using Anthropic: {ai_provider.model}")
-    else:
-        await update.message.reply_text(f"Currently using OpenAI: {ai_provider.model}")
+    await update.message.reply_text(f"Currently using {ai_provider.__class__.__name__}: {ai_provider.get_model()}")
 
 def main() -> None:
     # Create the Application and pass it your bot's token