diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py b/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py
index 7bf634f00c..c7132ce373 100644
--- a/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py
+++ b/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py
@@ -50,11 +50,11 @@ class ImportTemplateLoader(load.LoaderPlugin):
             self.__class__.__name__
         )
 
-        def update(self, container, context):
-            pass
+    def update(self, container, context):
+        pass
 
-        def remove(self, container):
-            pass
+    def remove(self, container):
+        pass
 
 
 class ImportWorkfileLoader(ImportTemplateLoader):
diff --git a/client/ayon_core/hosts/houdini/api/plugin.py b/client/ayon_core/hosts/houdini/api/plugin.py
index 0809f4e566..b33d0fe297 100644
--- a/client/ayon_core/hosts/houdini/api/plugin.py
+++ b/client/ayon_core/hosts/houdini/api/plugin.py
@@ -147,7 +147,6 @@ class HoudiniCreatorBase(object):
     def create_instance_node(
         folder_path, node_name, parent, node_type="geometry"
     ):
-        # type: (str, str, str) -> hou.Node
         """Create node representing instance.
 
         Arguments:
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py
index c16c95a270..6a2a41d1d0 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py
@@ -16,7 +16,7 @@ class CreateHDA(plugin.HoudiniCreator):
     maintain_selection = False
 
     def _check_existing(self, folder_path, product_name):
-        # type: (str) -> bool
+        # type: (str, str) -> bool
         """Check if existing product name versions already exists."""
         # Get all products of the current folder
         project_name = self.project_name
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py b/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py
index 31c0d0eaa1..83e743c92e 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py
@@ -40,9 +40,11 @@ class _NodeTypeAttrib(object):
         return "{}.{}".format(node, self.colour_space)
 
     def __str__(self):
-        return "_NodeTypeAttrib(name={}, fname={}, "
-        "computed_fname={}, colour_space={})".format(
-            self.name, self.fname, self.computed_fname, self.colour_space)
+        return (
+            "_NodeTypeAttrib(name={}, fname={}, "
+            "computed_fname={}, colour_space={})".format(
+                self.name, self.fname, self.computed_fname, self.colour_space)
+        )
 
 
 NODETYPES = {
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py
index b488ab364d..adbe02eb74 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py
@@ -9,7 +9,6 @@ class CollectAutoImage(pyblish.api.ContextPlugin):
     """
 
     label = "Collect Auto Image"
-    order = pyblish.api.CollectorOrder
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.2
 
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py
index 0585f4f226..7a5f297c89 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py
@@ -8,7 +8,6 @@ class CollectAutoImageRefresh(pyblish.api.ContextPlugin):
     """
 
     label = "Collect Auto Image Refresh"
-    order = pyblish.api.CollectorOrder
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.2
 
diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/client/ayon_core/modules/deadline/deadline_module.py
index d2f0e263d4..c0ba83477e 100644
--- a/client/ayon_core/modules/deadline/deadline_module.py
+++ b/client/ayon_core/modules/deadline/deadline_module.py
@@ -46,7 +46,6 @@ class DeadlineModule(AYONAddon, IPluginPaths):
 
     @staticmethod
     def get_deadline_pools(webservice, log=None):
-        # type: (str) -> list
         """Get pools from Deadline.
         Args:
             webservice (str): Server url.
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index 8123409052..b7ca227b01 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -9,11 +9,11 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
     DL webservice addresses must be configured first in System Settings for
     project settings enum to work.
 
-    Default webservice could be overriden by
+    Default webservice could be overridden by
     `project_settings/deadline/deadline_servers`. Currently only single url
     is expected.
 
-    This url could be overriden by some hosts directly on instances with
+    This url could be overridden by some hosts directly on instances with
     `CollectDeadlineServerFromInstance`.
     """
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index a666c5c2dc..6263526d5c 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -149,7 +149,7 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
         """
         # no frames in file name at all, eg 'renderCompositingMain.withLut.mov'
         if not frame_placeholder:
-            return set([file_name_template])
+            return {file_name_template}
 
         real_expected_rendered = set()
         src_padding_exp = "%0{}d".format(len(frame_placeholder))
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py b/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
index 9641c16d20..f146aef7b4 100644
--- a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
+++ b/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
@@ -404,7 +404,7 @@ class OpenPypeTileAssembler(DeadlinePlugin):
         Args:
             output_width (int): Width of output image.
             output_height (int): Height of output image.
-            tiles_info (list): List of tile items, each item must be
+            tile_info (list): List of tile items, each item must be
                 dictionary with `filepath`, `pos_x` and `pos_y` keys
                 representing path to file and x, y coordinates on output
                 image where top-left point of tile item should start.