diff --git a/src/views/form/inputGroup.js b/src/views/form/inputGroup.js
index 1890b2b23067c222135d11b22748f78501034a4f..488de7c516a4b720c5584233105d7c0b6af62946 100644
--- a/src/views/form/inputGroup.js
+++ b/src/views/form/inputGroup.js
@@ -13,7 +13,7 @@ export default class InputGroup {
   view(vnode) {
     // set display-settings accoridng to error-state
     let errorField = null;
-    let groupClasses = vnode.attrs.classes ? vnode.attrs.classes : '';
+    let groupClasses = vnode.attrs.classes || '';
     const errors = this.getErrors();
     if (errors.length > 0) {
       errorField = m('span', `Error: ${errors.join(', ')}`);
@@ -37,15 +37,13 @@ export default class InputGroup {
       ]);
     }
     args.list = `${vnode.attrs.name}-datalist`;
-    if (typeof args.getSuggestions === 'function') {
+    if (args.getSuggestions) {
       args.oninput_original = args.oninput;
       args.oninput = (e) => {
-        if (typeof args.getSuggestions === 'function') {
-          args.getSuggestions(e.target.value, (result) => {
-            this.suggestions = result;
-          });
-        }
-        if (typeof args.oninput_original === 'function') {
+        args.getSuggestions(e.target.value, (result) => {
+          this.suggestions = result;
+        });
+        if (args.oninput_original) {
           args.oninput_original(e);
         }
       };
diff --git a/src/views/form/jsonSchemaForm.js b/src/views/form/jsonSchemaForm.js
index a83c8900eb681ce1f51ee0abbf66f041f81e641d..f7d34a1556e36c4f8c204f31697fcf3dc9864633 100644
--- a/src/views/form/jsonSchemaForm.js
+++ b/src/views/form/jsonSchemaForm.js
@@ -1,7 +1,6 @@
 import m from 'mithril';
 import Ajv from 'ajv';
 import jsonSchemaDraft04 from 'ajv/lib/refs/json-schema-draft-04.json';
-import { isNullOrUndefined } from 'util';
 import { log } from '../../models/log';
 import inputGroup from './inputGroup';
 import selectGroup from './selectGroup';
@@ -27,7 +26,7 @@ export default class JSONSchemaForm {
     } else {
       this.ajv.addSchema(this.schema, 'schema');
     }
-    if (isNullOrUndefined(this.fieldOrder)) {
+    if (!this.fieldOrder) {
       this.fieldOrder = [];
     }
   }