diff --git a/pallets/domains/src/lib.rs b/pallets/domains/src/lib.rs
index 5ea4bab6..a9703b31 100644
--- a/pallets/domains/src/lib.rs
+++ b/pallets/domains/src/lib.rs
@@ -193,9 +193,9 @@ pub mod pallet {
         TooManyDomainsPerAccount,
         /// This domain label may contain only a-z, 0-9 and hyphen characters.
         DomainContainsInvalidChar,
-        /// This domain name length must be greater or equal the [`Config::MinDomainLength`] limit.
+        /// The length of this domain name must be greater than or equal to the [`Config::MinDomainLength`] limit.
         DomainIsTooShort,
-        /// This domain name length must be below or equal the [`Config::MaxDomainLength`] limit.
+        /// The length of this domain name must be less than or equal to the [`Config::MaxDomainLength`] limit.
         DomainIsTooLong,
         /// This domain has expired.
         DomainHasExpired,
diff --git a/pallets/space-ownership/tests/src/tests.rs b/pallets/space-ownership/tests/src/tests.rs
index 6ecddc35..1aa5058f 100644
--- a/pallets/space-ownership/tests/src/tests.rs
+++ b/pallets/space-ownership/tests/src/tests.rs
@@ -124,7 +124,7 @@ fn accept_pending_ownership_should_fail_if_no_pending_transfer() {
 }
 
 #[test]
-fn accept_pending_ownership_should_not_allow_non_target_to_accept() {
+fn accept_pending_ownership_should_not_allow_non_target_account_to_accept() {
     ExtBuilder::build_with_pending_transfers().execute_with(|| {
         let _m = use_static_mock();
         let creator_staking_ctx = MockCreatorStaking::is_creator_active_context();
diff --git a/pallets/spaces/src/lib.rs b/pallets/spaces/src/lib.rs
index f35d8ac2..64ccb7bb 100644
--- a/pallets/spaces/src/lib.rs
+++ b/pallets/spaces/src/lib.rs
@@ -436,7 +436,6 @@ pub mod pallet {
             Self::ensure_space_limit_not_reached(&new_owner)?;
             let space = Pallet::<T>::require_space(space_id)?;
 
-            // TODO: reuse copy-pasted parts of code
             SpaceIdsByOwner::<T>::mutate(&space.owner, |ids| {
                 remove_from_bounded_vec(ids, space_id)
             });