diff --git a/lib/cwtch/ffi.dart b/lib/cwtch/ffi.dart
index ef837140..665276e4 100644
--- a/lib/cwtch/ffi.dart
+++ b/lib/cwtch/ffi.dart
@@ -924,9 +924,6 @@ class CwtchFfi implements Cwtch {
     malloc.free(u1);
   }
 
-
-
-
   @override
   bool IsServersCompiled() {
     return library.providesSymbol("c_LoadServers");
diff --git a/lib/cwtch/gomobile.dart b/lib/cwtch/gomobile.dart
index 8072c5f4..ada66b34 100644
--- a/lib/cwtch/gomobile.dart
+++ b/lib/cwtch/gomobile.dart
@@ -365,7 +365,6 @@ class CwtchGomobile implements Cwtch {
     cwtchPlatform.invokeMethod("DeleteServerInfo", {"ProfileOnion": profile, "handle": handle});
   }
 
-
   @override
   void UpdateSettings(String json) {
     cwtchPlatform.invokeMethod("UpdateSettings", {"json": json});
diff --git a/lib/models/profile.dart b/lib/models/profile.dart
index d80bcce8..49a3e4c4 100644
--- a/lib/models/profile.dart
+++ b/lib/models/profile.dart
@@ -68,7 +68,6 @@ class ProfileInfoState extends ChangeNotifier {
       this._contacts.addAll(contacts.map((contact) {
         this._unreadMessages += contact["numUnread"] as int;
 
-
         return ContactInfoState(this.onion, contact["identifier"], contact["onion"],
             nickname: contact["name"],
             localNickname: contact["attributes"]?["local.profile.name"] ?? "", // contact may not have a local name
diff --git a/lib/settings.dart b/lib/settings.dart
index 1366f7e9..98514826 100644
--- a/lib/settings.dart
+++ b/lib/settings.dart
@@ -134,7 +134,7 @@ class Settings extends ChangeNotifier {
     // Decide whether to enable Experiments
     var fontScale = settings["FontScaling"];
     if (fontScale == null) {
-        fontScale = 1.0;
+      fontScale = 1.0;
     }
     _fontScaling = double.parse(fontScale.toString()).clamp(0.5, 2.0);
 
diff --git a/lib/views/peersettingsview.dart b/lib/views/peersettingsview.dart
index 07031b28..dcf721b4 100644
--- a/lib/views/peersettingsview.dart
+++ b/lib/views/peersettingsview.dart
@@ -217,12 +217,12 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                                 subtitle: Text(AppLocalizations.of(context)!.savePeerHistoryDescription),
                                 leading: Icon(CwtchIcons.peer_history, color: settings.current().mainTextColor),
                                 trailing: DropdownButton(
-                                    value: (Provider.of<ContactInfoState>(context).savePeerHistory == "DefaultDeleteHistory" ||
-                                        Provider.of<ContactInfoState>(context).savePeerHistory == "HistoryDefault")
-                                        ? AppLocalizations.of(context)!.conversationNotificationPolicyDefault
-                                        : (Provider.of<ContactInfoState>(context).savePeerHistory == "SaveHistory"
-                                            ? AppLocalizations.of(context)!.savePeerHistory
-                                            : AppLocalizations.of(context)!.dontSavePeerHistory),
+                                    value:
+                                        (Provider.of<ContactInfoState>(context).savePeerHistory == "DefaultDeleteHistory" || Provider.of<ContactInfoState>(context).savePeerHistory == "HistoryDefault")
+                                            ? AppLocalizations.of(context)!.conversationNotificationPolicyDefault
+                                            : (Provider.of<ContactInfoState>(context).savePeerHistory == "SaveHistory"
+                                                ? AppLocalizations.of(context)!.savePeerHistory
+                                                : AppLocalizations.of(context)!.dontSavePeerHistory),
                                     onChanged: (newValue) {
                                       setState(() {
                                         // Set whether or not to dave the Contact History...
@@ -234,7 +234,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                                         const HistoryDefault = "HistoryDefault";
 
                                         // NOTE: .savePeerHistory is used to show ephemeral warnings so it's state is important to update.
-                                        if(newValue == AppLocalizations.of(context)!.conversationNotificationPolicyDefault) {
+                                        if (newValue == AppLocalizations.of(context)!.conversationNotificationPolicyDefault) {
                                           Provider.of<ContactInfoState>(context, listen: false).savePeerHistory = HistoryDefault;
                                           Provider.of<FlwtchState>(context, listen: false).cwtch.SetConversationAttribute(profileOnion, identifier, SaveHistoryKey, HistoryDefault);
                                         } else if (newValue == AppLocalizations.of(context)!.savePeerHistory) {
@@ -246,7 +246,11 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                                         }
                                       });
                                     },
-                                    items: [AppLocalizations.of(context)!.conversationNotificationPolicyDefault, AppLocalizations.of(context)!.savePeerHistory, AppLocalizations.of(context)!.dontSavePeerHistory].map<DropdownMenuItem<String>>((String value) {
+                                    items: [
+                                      AppLocalizations.of(context)!.conversationNotificationPolicyDefault,
+                                      AppLocalizations.of(context)!.savePeerHistory,
+                                      AppLocalizations.of(context)!.dontSavePeerHistory
+                                    ].map<DropdownMenuItem<String>>((String value) {
                                       return DropdownMenuItem<String>(
                                         value: value,
                                         child: Text(value, style: settings.scaleFonts(defaultDropDownMenuItemTextStyle)),
diff --git a/lib/views/remoteserverview.dart b/lib/views/remoteserverview.dart
index 859747ec..f4430c43 100644
--- a/lib/views/remoteserverview.dart
+++ b/lib/views/remoteserverview.dart
@@ -97,9 +97,11 @@ class _RemoteServerViewState extends State<RemoteServerView> {
                   Tooltip(
                       message: serverInfoState.groups.isNotEmpty ? AppLocalizations.of(context)!.cannotDeleteServerIfActiveGroups : AppLocalizations.of(context)!.leaveConversation,
                       child: ElevatedButton.icon(
-                        onPressed: serverInfoState.groups.isNotEmpty ? null :  () {
-                          showAlertDialog(context);
-                        },
+                        onPressed: serverInfoState.groups.isNotEmpty
+                            ? null
+                            : () {
+                                showAlertDialog(context);
+                              },
                         icon: Icon(CwtchIcons.leave_group),
                         label: Text(
                           AppLocalizations.of(context)!.deleteBtn,
@@ -112,7 +114,6 @@ class _RemoteServerViewState extends State<RemoteServerView> {
                   child: Text(AppLocalizations.of(context)!.groupsOnThisServerLabel),
                 ),
                 Expanded(child: _buildGroupsList(serverInfoState)),
-
               ])));
     });
   }
diff --git a/lib/widgets/messagelist.dart b/lib/widgets/messagelist.dart
index 2de84486..cc79af9b 100644
--- a/lib/widgets/messagelist.dart
+++ b/lib/widgets/messagelist.dart
@@ -38,7 +38,7 @@ class _MessageListState extends State<MessageList> {
     //bool isGroupAndSynced = Provider.of<ContactInfoState>(context).isGroup && Provider.of<ContactInfoState>(context).status == "Synced";
     //bool isGroupAndNotAuthenticated = Provider.of<ContactInfoState>(context).isGroup && Provider.of<ContactInfoState>(context).status != "Authenticated";
 
-    bool preserveHistoryByDefault = Provider.of<Settings>(context, listen:false).preserveHistoryByDefault;
+    bool preserveHistoryByDefault = Provider.of<Settings>(context, listen: false).preserveHistoryByDefault;
     bool showEphemeralWarning = (isP2P && (!preserveHistoryByDefault && Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory"));
     bool showOfflineWarning = Provider.of<ContactInfoState>(context).isOnline() == false;
     bool showSyncing = isGroupAndSyncing;