diff --git a/ios/src_library/React Native/RNIModalView/RNIModalViewModule.m b/ios/src_library/React Native/RNIModalView/RNIModalViewModule.m
index fbfc20f1..47dc55c8 100644
--- a/ios/src_library/React Native/RNIModalView/RNIModalViewModule.m	
+++ b/ios/src_library/React Native/RNIModalView/RNIModalViewModule.m	
@@ -11,14 +11,15 @@
 
 @interface RCT_EXTERN_MODULE(RNIModalViewModule, RCTEventEmitter)
 
-RCT_EXTERN_METHOD(dismissModalByID
-          : (NSString)modalID
-  callback: (RCTResponseSenderBlock)callback
+// MARK: - Standalone Functions
+// ----------------------------
+
+RCT_EXTERN_METHOD(dismissModalByID: (NSString)modalID
+                  callback: (RCTResponseSenderBlock)callback
 );
 
-RCT_EXTERN_METHOD(dismissAllModals
-          : (bool)animated
-  callback: (RCTResponseSenderBlock)callback
+RCT_EXTERN_METHOD(dismissAllModals: (bool)animated
+                  callback: (RCTResponseSenderBlock)callback
 );
 
 @end
diff --git a/ios/src_library/React Native/RNIModalView/RNIModalViewModule.swift b/ios/src_library/React Native/RNIModalView/RNIModalViewModule.swift
index fddf7fea..ce408225 100644
--- a/ios/src_library/React Native/RNIModalView/RNIModalViewModule.swift	
+++ b/ios/src_library/React Native/RNIModalView/RNIModalViewModule.swift	
@@ -36,12 +36,16 @@ class RNIModalViewModule: RCTEventEmitter {
   };
 };
 
-// -----------------------------
-// MARK: Extension: JS Functions
-// -----------------------------
+// MARK: - Standalone Functions
+// ----------------------------
 
 extension RNIModalViewModule {
-  @objc func dismissModalByID(_ modalID: NSString, callback: @escaping RCTResponseSenderBlock) {
+  
+  // TODO: Re-write + Cleanup
+  @objc func dismissModalByID(
+    _ modalID: NSString,
+    callback: @escaping RCTResponseSenderBlock
+  ) {
     DispatchQueue.main.async {
       guard let rootVC = UIWindow.key?.rootViewController else {
         #if DEBUG
@@ -112,7 +116,10 @@ extension RNIModalViewModule {
     };
   };
   
-  @objc func dismissAllModals(_ animated: Bool, callback: @escaping RCTResponseSenderBlock){
+  @objc func dismissAllModals(
+    _ animated: Bool,
+    callback: @escaping RCTResponseSenderBlock
+  ) {
     DispatchQueue.main.async {
       let success: Void? = UIWindow.key?
         .rootViewController?
@@ -123,9 +130,9 @@ extension RNIModalViewModule {
   };
 };
 
-// --------------------------
-// MARK: Extension: JS Events
-// --------------------------
+
+// MARK: Extension - JS Events
+// ---------------------------
 
 extension RNIModalViewModule {
   func sendModalEvent(event: Events, params: Dictionary<AnyHashable, Any>) {