diff --git a/lib/api_form.dart b/lib/api_form.dart
index fc4b3a36..7fedbcdc 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -7,7 +7,7 @@ import "package:date_field/date_field.dart";
 
 import "package:inventree/api.dart";
 import "package:inventree/app_colors.dart";
-import 'package:inventree/helpers.dart';
+import "package:inventree/helpers.dart";
 import "package:inventree/inventree/part.dart";
 import "package:inventree/inventree/sentry.dart";
 import "package:inventree/inventree/stock.dart";
@@ -181,7 +181,7 @@ class APIFormField {
   // Extract error messages from the server response
   void extractErrorMessages(APIResponse response) {
 
-    dynamic errors = null;
+    dynamic errors;
 
     if (isSimple) {
       // Simple fields are easily handled
@@ -1042,9 +1042,9 @@ class _APIFormWidgetState extends State<APIFormWidget> {
         if (result is String) {
           errors.add(result);
         } else if (result is List) {
-          result.forEach((element) {
+          for (dynamic element in result) {
             errors.add(element.toString());
-          });
+          }
         }
       }
     }
diff --git a/lib/inventree/stock.dart b/lib/inventree/stock.dart
index 22b5e709..a0aec8b4 100644
--- a/lib/inventree/stock.dart
+++ b/lib/inventree/stock.dart
@@ -1,8 +1,8 @@
 import "dart:async";
 
-import 'package:flutter/material.dart';
+import "package:flutter/material.dart";
 import "package:intl/intl.dart";
-import 'package:inventree/helpers.dart';
+import "package:inventree/helpers.dart";
 import "package:inventree/inventree/part.dart";
 import "package:flutter/cupertino.dart";
 
diff --git a/lib/widget/purchase_order_detail.dart b/lib/widget/purchase_order_detail.dart
index 641e5402..6d6881cf 100644
--- a/lib/widget/purchase_order_detail.dart
+++ b/lib/widget/purchase_order_detail.dart
@@ -1,25 +1,19 @@
-import 'package:dropdown_search/dropdown_search.dart';
 import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 
 import "package:inventree/api.dart";
-import 'package:inventree/api_form.dart';
+import "package:inventree/api_form.dart";
 import "package:inventree/app_colors.dart";
-import 'package:inventree/helpers.dart';
+import "package:inventree/helpers.dart";
 import "package:inventree/inventree/company.dart";
-import 'package:inventree/inventree/model.dart';
-import 'package:inventree/inventree/part.dart';
 import "package:inventree/inventree/purchase_order.dart";
-import 'package:inventree/inventree/stock.dart';
 import "package:inventree/widget/company_detail.dart";
 import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/l10.dart";
 import "package:inventree/widget/location_display.dart";
-import 'package:inventree/widget/snacks.dart';
-import 'package:one_context/one_context.dart';
-
-import 'dialogs.dart';
+import "package:inventree/widget/snacks.dart";
+import "package:one_context/one_context.dart";
 
 
 class PurchaseOrderDetailWidget extends StatefulWidget {