diff --git a/src/_h5ai/client/js/inc/ext/contextmenu.js b/src/_h5ai/client/js/inc/ext/contextmenu.js
index be9fe7b9..df40580c 100644
--- a/src/_h5ai/client/js/inc/ext/contextmenu.js
+++ b/src/_h5ai/client/js/inc/ext/contextmenu.js
@@ -44,14 +44,16 @@ modulejs.define('ext/contextmenu', ['_', '$', 'core/resource', 'core/settings'],
 
             } else if (entry.type === 'l') {
                 $(templateLabel)
-                    .find('.cm-text').text(entry.text).end()
-                    .appendTo($ul);
+                    .appendTo($ul)
+                    .find('.cm-text')
+                    .text(entry.text);
 
             } else if (entry.type === 'e') {
                 $li = $(templateEntry)
+                        .appendTo($ul)
                         .data('cm-id', entry.id)
-                        .find('.cm-text').text(entry.text).end()
-                        .appendTo($ul);
+                        .find('.cm-text')
+                        .text(entry.text);
 
                 if (entry.icon) {
                     $li.find('.cm-icon img').attr('src', resource.icon(entry.icon));
diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js
index c98fc0d7..92251009 100644
--- a/src/_h5ai/client/js/inc/ext/crumb.js
+++ b/src/_h5ai/client/js/inc/ext/crumb.js
@@ -24,7 +24,7 @@ modulejs.define('ext/crumb', ['_', '$', 'core/event', 'core/location', 'core/res
             .data('item', item);
 
         location.setLink($html, item);
-        $html.find('.label').text(item.label).end();
+        $html.find('.label').text(item.label);
 
         if (item.isDomain() || item.isRoot()) {
             $html.find('.sep').width(0);
diff --git a/src/_h5ai/client/js/inc/ext/preview.js b/src/_h5ai/client/js/inc/ext/preview.js
index 90e1d32e..8f1b29a2 100644
--- a/src/_h5ai/client/js/inc/ext/preview.js
+++ b/src/_h5ai/client/js/inc/ext/preview.js
@@ -153,9 +153,9 @@ modulejs.define('ext/preview', ['_', '$', 'core/resource', 'core/settings', 'cor
     function setRawLink(href) {
 
         if (href) {
-            $('#pv-bar-raw').find('a').attr('href', href).end().show();
+            $('#pv-bar-raw').show().find('a').attr('href', href);
         } else {
-            $('#pv-bar-raw').find('a').attr('href', '#').end().hide();
+            $('#pv-bar-raw').hide().find('a').attr('href', '#');
         }
     }
 
diff --git a/src/_h5ai/client/js/inc/ext/sort.js b/src/_h5ai/client/js/inc/ext/sort.js
index c4b5e52a..78e2a2d7 100644
--- a/src/_h5ai/client/js/inc/ext/sort.js
+++ b/src/_h5ai/client/js/inc/ext/sort.js
@@ -125,31 +125,28 @@ modulejs.define('ext/sort', ['_', '$', 'core/event', 'core/resource', 'core/sett
             return;
         }
 
-        $('#items li.header')
+        var $header = $('#items li.header');
 
-            .find('a.label')
-                .append(template)
-                .click(function (ev) {
-                    sortItems(0, $(this).hasClass('ascending'));
-                    ev.preventDefault();
-                })
-            .end()
+        $header.find('a.label')
+            .append(template)
+            .click(function (ev) {
+                sortItems(0, $(this).hasClass('ascending'));
+                ev.preventDefault();
+            });
 
-            .find('a.date')
-                .prepend(template)
-                .click(function (ev) {
-                    sortItems(1, $(this).hasClass('ascending'));
-                    ev.preventDefault();
-                })
-            .end()
+        $header.find('a.date')
+            .prepend(template)
+            .click(function (ev) {
+                sortItems(1, $(this).hasClass('ascending'));
+                ev.preventDefault();
+            });
 
-            .find('a.size')
-                .prepend(template)
-                .click(function (ev) {
-                    sortItems(2, $(this).hasClass('ascending'));
-                    ev.preventDefault();
-                })
-            .end();
+        $header.find('a.size')
+            .prepend(template)
+            .click(function (ev) {
+                sortItems(2, $(this).hasClass('ascending'));
+                ev.preventDefault();
+            });
 
         event.sub('location.changed', onContentChanged);
         event.sub('location.refreshed', onContentChanged);
diff --git a/src/_h5ai/client/js/inc/main/info.js b/src/_h5ai/client/js/inc/main/info.js
index e816bf1b..11e58b2b 100644
--- a/src/_h5ai/client/js/inc/main/info.js
+++ b/src/_h5ai/client/js/inc/main/info.js
@@ -23,18 +23,12 @@ modulejs.define('main/info', ['$', 'config'], function ($, config) {
 
     function addTest(label, info, passed, result) {
 
-        $(testTemp)
-            .find('.label')
-                .text(label)
-            .end()
-            .find('.result')
+        var $test = $(testTemp).appendTo('#tests');
+        $test.find('.label').text(label);
+        $test.find('.result')
                 .addClass(passed ? 'passed' : 'failed')
-                .text(result ? result : (passed ? 'yes' : 'no'))
-            .end()
-            .find('.info')
-                .html(info)
-            .end()
-            .appendTo('#tests');
+                .text(result ? result : (passed ? 'yes' : 'no'));
+        $test.find('.info').html(info);
     }
 
     function addTests() {