diff --git a/AltStore/Operations/FetchSourceOperation.swift b/AltStore/Operations/FetchSourceOperation.swift
index aa663562..d154b196 100644
--- a/AltStore/Operations/FetchSourceOperation.swift
+++ b/AltStore/Operations/FetchSourceOperation.swift
@@ -159,8 +159,8 @@ final class FetchSourceOperation: ResultOperation<Source>
                             userInfo[NSDebugDescriptionErrorKey] = pathDescription
                         }
                         
-                        // @mahee96: Need to account for invalid/missing json fields error
-                        //           and show meaningful message to user instead of just showing decoder error
+                        // TODO: @mahee96: Need to account for invalid/missing json fields error
+                        //                 and show meaningful message to user instead of just showing decoder error
                         throw NSError(domain: nsError.domain, code: nsError.code, userInfo: userInfo)
                     }
                     
diff --git a/AltStore/Operations/UpdateKnownSourcesOperation.swift b/AltStore/Operations/UpdateKnownSourcesOperation.swift
index 96d99eb1..5a1e0470 100644
--- a/AltStore/Operations/UpdateKnownSourcesOperation.swift
+++ b/AltStore/Operations/UpdateKnownSourcesOperation.swift
@@ -12,7 +12,7 @@ import AltStoreCore
 
 private extension URL
 {
-    // @mahee96: update this to a non-branch specific (prod-ready) location like github.io repo similar to anisette servers URL list
+    // TODO: @mahee96: update this to a non-branch specific (prod-ready) location like github.io repo similar to anisette servers URL list
     #if STAGING
 //    static let sources = URL(string: "https://raw.githubusercontent.com/SideStore/SideStore/develop/trustedapps.json")!
     static let sources = URL(string: "https://raw.githubusercontent.com/SideStore/SideStore/rebase-2.0-wip/trustedapps.json")!
diff --git a/AltStore/Operations/VerifyAppOperation.swift b/AltStore/Operations/VerifyAppOperation.swift
index 27ed3657..466b6ca2 100644
--- a/AltStore/Operations/VerifyAppOperation.swift
+++ b/AltStore/Operations/VerifyAppOperation.swift
@@ -126,7 +126,7 @@ private extension VerifyAppOperation
         
         if let buildVersion
         {
-            // @mahee96: requires altsign-marketplace branch release or equivalent
+            // TODO: @mahee96: requires altsign-marketplace branch release or equivalent
 //            guard buildVersion == app.buildVersion else { throw VerificationError.mismatchedBuildVersion(app.buildVersion, expectedVersion: buildVersion, app: app) }
         }
     }
diff --git a/AltStore/Sources/SourcesViewController.swift b/AltStore/Sources/SourcesViewController.swift
index af4bdb67..c9cb21c4 100644
--- a/AltStore/Sources/SourcesViewController.swift
+++ b/AltStore/Sources/SourcesViewController.swift
@@ -179,6 +179,7 @@ private extension SourcesViewController
     
     func makeDataSource() -> RSTFetchedResultsCollectionViewPrefetchingDataSource<Source, UIImage>
     {
+        // TODO: @mahee96: Need implementation to keep SideStore-Official source always on top
         let fetchRequest = Source.fetchRequest() as NSFetchRequest<Source>
         fetchRequest.returnsObjectsAsFaults = false
         fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \Source.name, ascending: true),
diff --git a/AltStoreCore/Model/InstalledApp.swift b/AltStoreCore/Model/InstalledApp.swift
index ed9c220e..4f64309c 100644
--- a/AltStoreCore/Model/InstalledApp.swift
+++ b/AltStoreCore/Model/InstalledApp.swift
@@ -140,7 +140,7 @@ public extension InstalledApp
         
         self.resignedBundleIdentifier = resignedApp.bundleIdentifier
         self.version = resignedApp.version
-        // @mahee96: requires altsign-marketplace branch release or equivalent
+        // TODO: @mahee96: requires altsign-marketplace branch release or equivalent
 //        self.buildVersion = resignedApp.buildVersion
         self.storeBuildVersion = storeBuildVersion