diff --git a/enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift b/enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift
index 0d1208ab3095ba9efcc26fefa26f88bb9747c293..4a85b6453f12d8c9cb413a8144e78f5b19510138 100644
--- a/enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift
+++ b/enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift
@@ -3,7 +3,7 @@
 //  enzevalos_iphone
 //
 //  Created by Oliver Wiese on 12.11.20.
-//  modified by Chris Offner & Claire Bräuer in March 2021
+//  Modified by Chris Offner & Claire Bräuer in March 2021.
 //  Copyright © 2020 fu-berlin. All rights reserved.
 //
 
diff --git a/enzevalos_iphone/SwiftUI/Compose/RecipientFieldModel.swift b/enzevalos_iphone/SwiftUI/Compose/RecipientFieldModel.swift
index e410eb1fe4b634b15a55a60dfe9f8fd13b6e8e69..2979c8213f42105a4c4cd9af1e2ff282973f36ab 100644
--- a/enzevalos_iphone/SwiftUI/Compose/RecipientFieldModel.swift
+++ b/enzevalos_iphone/SwiftUI/Compose/RecipientFieldModel.swift
@@ -2,8 +2,8 @@
 //  TokenFieldModel.swift
 //  enzevalos_iphone
 //
-//  Created by Oliver Wiese on 31.10.20,
-//  modified by Chris Offner & Claire Bräuer in March 2021
+//  Created by Oliver Wiese on 31.10.20.
+//  Modified by Chris Offner & Claire Bräuer in March 2021.
 //  Copyright © 2020 fu-berlin. All rights reserved.
 //
 
diff --git a/enzevalos_iphone/SwiftUI/Compose/RecipientsModel.swift b/enzevalos_iphone/SwiftUI/Compose/RecipientsModel.swift
index bad60591b248d7919cd821effaf2266811b650c4..1e2c54290c9a45c60fd369f14bc32b89ef54f7f0 100644
--- a/enzevalos_iphone/SwiftUI/Compose/RecipientsModel.swift
+++ b/enzevalos_iphone/SwiftUI/Compose/RecipientsModel.swift
@@ -3,7 +3,7 @@
 //  enzevalos_iphone
 //
 //  Created by Oliver Wiese on 09.11.20.
-//  modified by Chris Offner & Claire Bräuer in March 2021
+//  Modified by Chris Offner & Claire Bräuer in March 2021.
 //  Copyright © 2020 fu-berlin. All rights reserved.
 //
 
diff --git a/enzevalos_iphone/SwiftUI/Inbox/InboxView.swift b/enzevalos_iphone/SwiftUI/Inbox/InboxView.swift
index 5fa3a96f52b8e4c4693c78bf8e3c0bca03b62d66..86f5aa9babec9c8e73e53ebcc3d2e6a35f397ab2 100644
--- a/enzevalos_iphone/SwiftUI/Inbox/InboxView.swift
+++ b/enzevalos_iphone/SwiftUI/Inbox/InboxView.swift
@@ -3,6 +3,7 @@
 //  enzevalos_iphone
 //
 //  Created by Oliver Wiese on 16.10.20.
+//  Modified by Chris Offner & Claire Bräuer in March 2021.
 //  Copyright © 2020 fu-berlin. All rights reserved.
 //
 
@@ -62,6 +63,7 @@ struct InboxView: View {
         }
     }
     
+    // TODO: Refactor lastUpdate to model
     private var lastUpdate: some View {
         var text = NSLocalizedString("Updating", comment: "updating...")
         
@@ -79,6 +81,8 @@ struct InboxView: View {
         }
     }
     
+    
+    // TODO: Refactor updateMails to model
     private func updateMails() {
         guard !updating else {
             return
@@ -96,6 +100,7 @@ struct InboxView: View {
         updating = true
     }
     
+    
     private var folderButton: some View {
         Button {
             goToFolders = true
@@ -112,6 +117,7 @@ struct InboxView: View {
     }
 }
 
+// Preview
 struct InboxView_Previews: PreviewProvider {
     static var previews: some View {
         return InboxView(folderPath: "INBOX", name: "INBOX")
diff --git a/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift b/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
index 6b6fa334ab7af558c629a5d38d6a9294d637f14a..63c43e9a8dfdcd769908b0efcb88cebf9f4d92ad 100644
--- a/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
+++ b/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
@@ -3,6 +3,7 @@
 //  enzevalos_iphone
 //
 //  Created by Oliver Wiese on 16.10.20.
+//  Modified by Chris Offner & Claire Bräuer in March 2021.
 //  Copyright © 2020 fu-berlin. All rights reserved.
 //
 
diff --git a/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift b/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift
index 335fde2c26014ff2688efe719d4c6a8bc0a2db77..1ea78852bf1656a5d6d86d28818389572ffd8f32 100644
--- a/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift	
+++ b/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift	
@@ -3,6 +3,7 @@
 //  enzevalos_iphone
 //
 //  Created by Oliver Wiese on 09.04.20.
+//  Modified by Chris Offner & Claire Bräuer in March 2021.
 //  Copyright © 2020 fu-berlin. All rights reserved.
 //