diff --git a/pr_agent/settings/pr_code_suggestions_prompts.toml b/pr_agent/settings/pr_code_suggestions_prompts.toml
index 10b95c92..93c2ace9 100644
--- a/pr_agent/settings/pr_code_suggestions_prompts.toml
+++ b/pr_agent/settings/pr_code_suggestions_prompts.toml
@@ -35,7 +35,7 @@ __old hunk__
 Specific instructions for generating code suggestions:
 - Provide up to {{ num_code_suggestions }} code suggestions. The suggestions should be diverse and insightful.
 - The suggestions should focus on ways to improve the new code in the PR, meaning focusing on lines from '__new hunk__' sections, starting with '+'. Use the '__old hunk__' sections to understand the context of the code changes.
-- Prioritize suggestions that address major problems, issues and possible bugs in the PR code.
+- Prioritize suggestions that address possible issues, major problems, and bugs in the PR code.
 - Don't suggest to add docstring, type hints, or comments, or to remove unused imports.
 - Suggestions should not repeat code already present in the '__new hunk__' sections.
 - Provide the exact line numbers range (inclusive) for each suggestion. Use the line numbers from the '__new hunk__' sections.
diff --git a/pr_agent/settings/pr_code_suggestions_reflect_prompts.toml b/pr_agent/settings/pr_code_suggestions_reflect_prompts.toml
index 5a85d743..b0e163b3 100644
--- a/pr_agent/settings/pr_code_suggestions_reflect_prompts.toml
+++ b/pr_agent/settings/pr_code_suggestions_reflect_prompts.toml
@@ -3,7 +3,7 @@ system="""You are a language model that specializes in reviewing and evaluating
 
 Your input is a PR code, and a list of code suggestions that were generated for the PR.
 Your goal is to inspect, review and score the suggestsions.
-Be aware - the suggestions may not always be correct or accurate, and you should evaluate them in relation to the actual PR code diff presented. Sometimes the suggestion may ignore parts of the actual code diff, and in that case, you should give a score of 0.
+Be aware - the suggestions may not always be correct or accurate, and you should evaluate them in relation to the actual PR code diff presented. Sometimes the suggestion may ignore parts of the actual code diff, and in that case, you should give it a score of 0.
 
 Specific instructions:
 - Carefully review both the suggestion content, and the related PR code diff. Mistakes in the suggestions can occur. Make sure the suggestions are correct, and properly derived from the PR code diff.
diff --git a/pr_agent/tools/pr_code_suggestions.py b/pr_agent/tools/pr_code_suggestions.py
index 1e4d3a0f..97b8f483 100644
--- a/pr_agent/tools/pr_code_suggestions.py
+++ b/pr_agent/tools/pr_code_suggestions.py
@@ -22,54 +22,53 @@ class PRCodeSuggestions:
     def __init__(self, pr_url: str, cli_mode=False, args: list = None,
                  ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
 
-        if pr_url:
-            self.git_provider = get_git_provider()(pr_url)
-            self.main_language = get_main_pr_language(
-                self.git_provider.get_languages(), self.git_provider.get_files()
-            )
+        self.git_provider = get_git_provider()(pr_url)
+        self.main_language = get_main_pr_language(
+            self.git_provider.get_languages(), self.git_provider.get_files()
+        )
 
-            # limit context specifically for the improve command, which has hard input to parse:
-            if get_settings().pr_code_suggestions.max_context_tokens:
-                MAX_CONTEXT_TOKENS_IMPROVE = get_settings().pr_code_suggestions.max_context_tokens
-                if get_settings().config.max_model_tokens > MAX_CONTEXT_TOKENS_IMPROVE:
-                    get_logger().info(f"Setting max_model_tokens to {MAX_CONTEXT_TOKENS_IMPROVE} for PR improve")
-                    get_settings().config.max_model_tokens = MAX_CONTEXT_TOKENS_IMPROVE
+        # limit context specifically for the improve command, which has hard input to parse:
+        if get_settings().pr_code_suggestions.max_context_tokens:
+            MAX_CONTEXT_TOKENS_IMPROVE = get_settings().pr_code_suggestions.max_context_tokens
+            if get_settings().config.max_model_tokens > MAX_CONTEXT_TOKENS_IMPROVE:
+                get_logger().info(f"Setting max_model_tokens to {MAX_CONTEXT_TOKENS_IMPROVE} for PR improve")
+                get_settings().config.max_model_tokens = MAX_CONTEXT_TOKENS_IMPROVE
 
 
-            # extended mode
-            try:
-                self.is_extended = self._get_is_extended(args or [])
-            except:
-                self.is_extended = False
-            if self.is_extended:
-                num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions_per_chunk
-            else:
-                num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions
+        # extended mode
+        try:
+            self.is_extended = self._get_is_extended(args or [])
+        except:
+            self.is_extended = False
+        if self.is_extended:
+            num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions_per_chunk
+        else:
+            num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions
 
-            self.ai_handler = ai_handler()
-            self.ai_handler.main_pr_language = self.main_language
-            self.patches_diff = None
-            self.prediction = None
-            self.cli_mode = cli_mode
-            self.vars = {
-                "title": self.git_provider.pr.title,
-                "branch": self.git_provider.get_pr_branch(),
-                "description": self.git_provider.get_pr_description(),
-                "language": self.main_language,
-                "diff": "",  # empty diff for initial calculation
-                "num_code_suggestions": num_code_suggestions,
-                "commitable_code_suggestions_mode": get_settings().pr_code_suggestions.commitable_code_suggestions,
-                "extra_instructions": get_settings().pr_code_suggestions.extra_instructions,
-                "commit_messages_str": self.git_provider.get_commit_messages(),
-            }
-            self.token_handler = TokenHandler(self.git_provider.pr,
-                                              self.vars,
-                                              get_settings().pr_code_suggestions_prompt.system,
-                                              get_settings().pr_code_suggestions_prompt.user)
+        self.ai_handler = ai_handler()
+        self.ai_handler.main_pr_language = self.main_language
+        self.patches_diff = None
+        self.prediction = None
+        self.cli_mode = cli_mode
+        self.vars = {
+            "title": self.git_provider.pr.title,
+            "branch": self.git_provider.get_pr_branch(),
+            "description": self.git_provider.get_pr_description(),
+            "language": self.main_language,
+            "diff": "",  # empty diff for initial calculation
+            "num_code_suggestions": num_code_suggestions,
+            "commitable_code_suggestions_mode": get_settings().pr_code_suggestions.commitable_code_suggestions,
+            "extra_instructions": get_settings().pr_code_suggestions.extra_instructions,
+            "commit_messages_str": self.git_provider.get_commit_messages(),
+        }
+        self.token_handler = TokenHandler(self.git_provider.pr,
+                                          self.vars,
+                                          get_settings().pr_code_suggestions_prompt.system,
+                                          get_settings().pr_code_suggestions_prompt.user)
 
-            self.progress = f"## Generating PR code suggestions\n\n"
-            self.progress += f"""\nWork in progress ...<br>\n<img src="https://codium.ai/images/pr_agent/dual_ball_loading-crop.gif" width=48>"""
-            self.progress_response = None
+        self.progress = f"## Generating PR code suggestions\n\n"
+        self.progress += f"""\nWork in progress ...<br>\n<img src="https://codium.ai/images/pr_agent/dual_ball_loading-crop.gif" width=48>"""
+        self.progress_response = None
 
     async def run(self):
         try: