diff --git a/assets/js/src/newsletters/listings/tabs.jsx b/assets/js/src/newsletters/listings/tabs.jsx
index 03c4a5ba60..004bd76ab1 100644
--- a/assets/js/src/newsletters/listings/tabs.jsx
+++ b/assets/js/src/newsletters/listings/tabs.jsx
@@ -28,7 +28,7 @@ const ListingTabs = React.createClass({
     };
   },
   render() {
-    const tabs = this.state.tabs.map(tab => {
+    const tabs = this.state.tabs.map((tab) => {
       const tabClasses = classNames(
         'nav-tab',
         { 'nav-tab-active': (this.props.tab === tab.name) }
diff --git a/assets/js/src/segments/form.jsx b/assets/js/src/segments/form.jsx
index 91f99dfe78..b3f1ca859d 100644
--- a/assets/js/src/segments/form.jsx
+++ b/assets/js/src/segments/form.jsx
@@ -1,64 +1,50 @@
-define(
-  [
-    'react',
-    'react-router',
-    'mailpoet',
-    'form/form.jsx',
-  ],
-  (
-    React,
-    Router,
-    MailPoet,
-    Form
-  ) => {
-    const fields = [
-      {
-        name: 'name',
-        label: MailPoet.I18n.t('name'),
-        type: 'text',
-      },
-      {
-        name: 'description',
-        label: MailPoet.I18n.t('description'),
-        type: 'textarea',
-        tip: MailPoet.I18n.t('segmentDescriptionTip'),
-      },
-    ];
+import React from 'react';
+import Router from 'react-router';
+import MailPoet from 'mailpoet';
+import Form from 'form/form.jsx';
 
-    const messages = {
-      onUpdate: function onUpdate() {
-        MailPoet.Notice.success(MailPoet.I18n.t('segmentUpdated'));
-      },
-      onCreate: function onCreate() {
-        MailPoet.Notice.success(MailPoet.I18n.t('segmentAdded'));
-        MailPoet.trackEvent('Lists > Add new', {
-          'MailPoet Free version': window.mailpoet_version,
-        });
-      },
-    };
+const fields = [
+  {
+    name: 'name',
+    label: MailPoet.I18n.t('name'),
+    type: 'text',
+  },
+  {
+    name: 'description',
+    label: MailPoet.I18n.t('description'),
+    type: 'textarea',
+    tip: MailPoet.I18n.t('segmentDescriptionTip'),
+  },
+];
 
-    const Link = Router.Link;
-
-    const SegmentForm = React.createClass({
-      render: function render() {
-        return (
-          <div>
-            <h1 className="title">
-              {MailPoet.I18n.t('segment')}
-              <Link className="page-title-action" to="/">{MailPoet.I18n.t('backToList')}</Link>
-            </h1>
-
-            <Form
-              endpoint="segments"
-              fields={fields}
-              params={this.props.params}
-              messages={messages}
-            />
-          </div>
-        );
-      },
+const messages = {
+  onUpdate: function onUpdate() {
+    MailPoet.Notice.success(MailPoet.I18n.t('segmentUpdated'));
+  },
+  onCreate: function onCreate() {
+    MailPoet.Notice.success(MailPoet.I18n.t('segmentAdded'));
+    MailPoet.trackEvent('Lists > Add new', {
+      'MailPoet Free version': window.mailpoet_version,
     });
+  },
+};
 
-    return SegmentForm;
-  }
+const Link = Router.Link;
+
+const SegmentForm = params => (
+  <div>
+    <h1 className="title">
+      {MailPoet.I18n.t('segment')}
+      <Link className="page-title-action" to="/">{MailPoet.I18n.t('backToList')}</Link>
+    </h1>
+
+    <Form
+      endpoint="segments"
+      fields={fields}
+      params={params}
+      messages={messages}
+    />
+  </div>
 );
+
+export default SegmentForm;