diff --git a/composer.json b/composer.json
index cd3a157..fd64526 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,14 @@
         "silverstripe/framework": "^4",
         "cebe/markdown": "1.1.2"
     },
+    "autoload": {
+        "psr-4": {
+            "SilverStripers\\markdown\\db\\": "src/db",
+            "SilverStripers\\markdown\\extensions\\": "src/extensions",
+            "SilverStripers\\markdown\\forms\\": "src/forms",
+            "SilverStripers\\markdown\\shortcodes\\": "src/shortcodes"
+        }
+    },
 
     "extra": {
         "expose": [
diff --git a/src/forms/MarkdownEditorConfig.php b/src/forms/MarkdownEditorConfig.php
index 5336f78..2ce3cb9 100644
--- a/src/forms/MarkdownEditorConfig.php
+++ b/src/forms/MarkdownEditorConfig.php
@@ -48,7 +48,7 @@ class MarkdownEditorConfig
             'title'     => 'Strike Through',
             'action'    => 'toggleStrikethrough'
         ],
-        "|",
+        '|',
         [
             'name'      => 'quote',
             'className' => 'fa fa-quote-left',
diff --git a/src/forms/MarkdownEditorField.php b/src/forms/MarkdownEditorField.php
index c323abd..772a087 100644
--- a/src/forms/MarkdownEditorField.php
+++ b/src/forms/MarkdownEditorField.php
@@ -8,16 +8,10 @@
  */
 namespace SilverStripers\markdown\forms;
 
-use SilverStripe\Assets\Shortcodes\ImageShortcodeProvider;
 use SilverStripe\Forms\TextareaField;
-use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
 use Exception;
 use SilverStripe\ORM\FieldType\DBHTMLText;
-use SilverStripe\View\Parsers\HTMLValue;
-use SilverStripe\Forms\HTMLEditor\HTMLEditorSanitiser;
-use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
-use SilverStripe\Forms\HTMLEditor\HTMLEditorConfig;
 
 class MarkdownEditorField extends TextareaField
 {