diff --git a/lib/$.coffee b/lib/$.coffee
index 2bbb69c76..85e418aca 100644
--- a/lib/$.coffee
+++ b/lib/$.coffee
@@ -93,10 +93,10 @@ $.addStyle = (css) ->
 $.x = (path, root=d.body) ->
   # XPathResult.ANY_UNORDERED_NODE_TYPE === 8
   d.evaluate(path, root, null, 8, null).singleNodeValue
-$.addClass = (el, className) ->
-  el.classList.add className
-$.rmClass = (el, className) ->
-  el.classList.remove className
+$.addClass = (el, className...) ->
+  el.classList.add className...
+$.rmClass = (el, className...) ->
+  el.classList.remove className...
 $.hasClass = (el, className) ->
   el.classList.contains className
 $.rm = do ->
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 41438fa25..d65c80a41 100644
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -200,11 +200,9 @@ Header =
   hideBarOnScroll: ->
     offsetY = window.pageYOffset
     if offsetY > (Header.previousOffset or 0)
-      $.addClass Header.bar, 'autohide'
-      $.addClass Header.bar, 'scroll'
+      $.addClass Header.bar, 'autohide', 'scroll'
     else
-      $.rmClass Header.bar, 'autohide'
-      $.rmClass Header.bar, 'scroll'
+      $.rmClass Header.bar,  'autohide', 'scroll'
     Header.previousOffset = offsetY
 
   setBarPosition: (bottom) ->
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 90700b014..254d2cba4 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -128,12 +128,7 @@ Main =
     return if !Main.isThisPageLegit() or $.hasClass doc, 'fourchan-x'
     # disable the mobile layout
     $('link[href*=mobile]', d.head)?.disabled = true
-    <% if (type === 'crx') { %>
-    $.addClass doc, 'blink'
-    <% } else { %>
-    $.addClass doc, 'gecko'
-    <% } %>
-    $.addClass doc, 'fourchan-x'
+    $.addClass doc, 'fourchan-x', '<% if (type === 'crx') { %>blink<% } else { %>gecko<% } %>'
     $.addStyle Main.css
 
     if g.VIEW is 'catalog'
diff --git a/src/Miscellaneous/PSAHiding.coffee b/src/Miscellaneous/PSAHiding.coffee
index f215f2c1b..0b1ad0a6b 100644
--- a/src/Miscellaneous/PSAHiding.coffee
+++ b/src/Miscellaneous/PSAHiding.coffee
@@ -2,16 +2,14 @@ PSAHiding =
   init: ->
     return if !Conf['Announcement Hiding']
 
-    $.addClass doc, 'hide-announcement'
-    $.addClass doc, 'hide-announcement-enabled'
+    $.addClass doc, 'hide-announcement', 'hide-announcement-enabled'
 
     $.on d, '4chanXInitFinished', @setup
   setup: ->
     $.off d, '4chanXInitFinished', PSAHiding.setup
 
     unless psa = $.id 'globalMessage'
-      $.rmClass doc, 'hide-announcement'
-      $.rmClass doc, 'hide-announcement-enabled'
+      $.rmClass doc, 'hide-announcement', 'hide-announcement-enabled'
       return
 
     entry =