diff --git a/src/linkahead/common/administration.py b/src/linkahead/common/administration.py
index c23a61a559b5f6f5d7b782743baadbc34b3f62fb..20ebe1abc3d64ed6b629ba2e365a1d0c6a383a53 100644
--- a/src/linkahead/common/administration.py
+++ b/src/linkahead/common/administration.py
@@ -32,8 +32,8 @@ import random
 from linkahead.common.utils import xml2str
 from linkahead.connection.connection import get_connection
 from linkahead.exceptions import (EntityDoesNotExistError, HTTPClientError,
-                               HTTPForbiddenError, HTTPResourceNotFoundError,
-                               ServerConfigurationException)
+                                  HTTPForbiddenError, HTTPResourceNotFoundError,
+                                  ServerConfigurationException)
 from lxml import etree
 
 
diff --git a/src/linkahead/common/models.py b/src/linkahead/common/models.py
index 38a327a9077b0f65b28ab4d7195b62485f72d755..01f77e97fae0bd5611b209db53168b1cbce5c554 100644
--- a/src/linkahead/common/models.py
+++ b/src/linkahead/common/models.py
@@ -3451,12 +3451,12 @@ class Container(list):
                 uri1, uri2 = Container._split_uri_string(entities)
             except ValueError as val_e:
                 raise uri_e from val_e
-        c1 = self._retrieve(entities=uri1, flags=flags)
-        c2 = self._retrieve(entities=uri2, flags=flags)
-        c1.extend(c2)
-        c1.messages.extend(c2.messages)
+            c1 = self._retrieve(entities=uri1, flags=flags)
+            c2 = self._retrieve(entities=uri2, flags=flags)
+            c1.extend(c2)
+            c1.messages.extend(c2.messages)
 
-        return c1
+            return c1
 
     def clear_server_messages(self):
         self.messages.clear_server_messages()
diff --git a/src/linkahead/utils/server_side_scripting.py b/src/linkahead/utils/server_side_scripting.py
index 6a419191e5d15d51d8850f6663c65efa183d236b..06caa3d94a629e368dc99f83dc2957c756b7b487 100644
--- a/src/linkahead/utils/server_side_scripting.py
+++ b/src/linkahead/utils/server_side_scripting.py
@@ -31,7 +31,7 @@ from lxml import etree
 from linkahead.connection.connection import get_connection
 from linkahead.connection.utils import urlencode
 from linkahead.connection.encode import (MultipartParam, multipart_encode,
-                                      ReadableMultiparts)
+                                         ReadableMultiparts)
 
 
 def _make_params(pos_args, opts):
diff --git a/unittests/test_entity.py b/unittests/test_entity.py
index f91613a0386da73ca816db5f6511e90de44bd993..abf82f0a9b557cf9d1d2365e01fedaa4eae0c565 100644
--- a/unittests/test_entity.py
+++ b/unittests/test_entity.py
@@ -28,7 +28,7 @@ from lxml import etree
 
 import os
 from linkahead import (INTEGER, Entity, Property, Record, RecordType,
-                    configure_connection)
+                       configure_connection)
 from linkahead.connection.mockup import MockUpServerConnection
 
 UNITTESTDIR = os.path.dirname(os.path.abspath(__file__))
diff --git a/unittests/test_error_handling.py b/unittests/test_error_handling.py
index 590755b916dc587bc079449cac0c23dd7c1de7f1..3f5241466e9a8f810b581cbb587e17ccf8f123ee 100644
--- a/unittests/test_error_handling.py
+++ b/unittests/test_error_handling.py
@@ -29,11 +29,11 @@ children.
 import linkahead as db
 from linkahead.common.models import raise_errors
 from linkahead.exceptions import (AuthorizationError,
-                               EntityDoesNotExistError, EntityError,
-                               EntityHasNoDatatypeError,
-                               TransactionError, UniqueNamesError,
-                               UnqualifiedParentsError,
-                               UnqualifiedPropertiesError)
+                                  EntityDoesNotExistError, EntityError,
+                                  EntityHasNoDatatypeError,
+                                  TransactionError, UniqueNamesError,
+                                  UnqualifiedParentsError,
+                                  UnqualifiedPropertiesError)
 
 from pytest import raises
 
diff --git a/unittests/test_high_level_api.py b/unittests/test_high_level_api.py
index f1c4b18c4802ddbd2b0af737af6ba945cd647aaa..f3d568fd6a002b5a749f7efaad3d45dae5822c41 100644
--- a/unittests/test_high_level_api.py
+++ b/unittests/test_high_level_api.py
@@ -25,19 +25,19 @@
 
 import linkahead as db
 from linkahead.high_level_api import (convert_to_entity, convert_to_python_object,
-                                   new_high_level_entity)
+                                      new_high_level_entity)
 from linkahead.high_level_api import (LinkAheadPythonUnresolvedParent,
-                                   LinkAheadPythonUnresolvedReference,
-                                   LinkAheadPythonRecord, LinkAheadPythonFile,
-                                   high_level_type_for_standard_type,
-                                   standard_type_for_high_level_type,
-                                   high_level_type_for_role,
-                                   LinkAheadPythonEntity)
+                                      LinkAheadPythonUnresolvedReference,
+                                      LinkAheadPythonRecord, LinkAheadPythonFile,
+                                      high_level_type_for_standard_type,
+                                      standard_type_for_high_level_type,
+                                      high_level_type_for_role,
+                                      LinkAheadPythonEntity)
 from linkahead.apiutils import compare_entities
 
 from linkahead.common.datatype import (is_list_datatype,
-                                    get_list_datatype,
-                                    is_reference)
+                                       get_list_datatype,
+                                       is_reference)
 
 import pytest
 from lxml import etree
diff --git a/unittests/test_yamlapi.py b/unittests/test_yamlapi.py
index 0b0aca47c009a6a2166b9c2dbeefbc168e71ad42..027e5750d74cabe7a102eb01415aeb3c2c950f61 100644
--- a/unittests/test_yamlapi.py
+++ b/unittests/test_yamlapi.py
@@ -23,8 +23,8 @@ import os
 import warnings
 import tempfile
 from linkahead.yamlapi import (append_sublist, kv_to_xml,
-                            dict_to_xml, yaml_to_xml,
-                            process, yaml_file_to_xml)
+                               dict_to_xml, yaml_to_xml,
+                               process, yaml_file_to_xml)
 
 with warnings.catch_warnings(record=True) as w:
     # Cause all warnings to always be triggered.