diff --git a/assets/js/curlparser.js b/assets/js/curlparser.js
index 601d0c7f9..0a6effa5e 100644
--- a/assets/js/curlparser.js
+++ b/assets/js/curlparser.js
@@ -7,19 +7,19 @@ import * as querystring from "querystring";
  * output this: 'msg1=value1&msg2=value2'
  * @param dataArguments
  */
-function joinDataArguments(dataArguments) {
+const joinDataArguments = (dataArguments) => {
   let data = "";
   dataArguments.forEach((argument, i) => {
     if (i === 0) {
       data += argument;
     } else {
-      data += "&" + argument;
+      data += `&${argument}`;
     }
   });
   return data;
 }
 
-function parseCurlCommand(curlCommand) {
+const parseCurlCommand = (curlCommand) => {
   let newlineFound = /\r|\n/.exec(curlCommand);
   if (newlineFound) {
     // remove newlines
@@ -47,7 +47,7 @@ function parseCurlCommand(curlCommand) {
   }
   let headers;
 
-  let parseHeaders = function (headerFieldName) {
+  const parseHeaders = (headerFieldName) => {
     if (parsedArguments[headerFieldName]) {
       if (!headers) {
         headers = {};
@@ -102,10 +102,8 @@ function parseCurlCommand(curlCommand) {
     });
   }
   if (cookieString) {
-    let cookieParseOptions = {
-      decode: function (s) {
-        return s;
-      }
+    const cookieParseOptions = {
+      decode: s => s
     };
     // separate out cookie headers into separate data structure
     // note: cookie is case insensitive
@@ -174,8 +172,8 @@ function parseCurlCommand(curlCommand) {
   });
 
   urlObject.search = null; // Clean out the search/query portion.
-  let request = {
-    url: url,
+  const request = {
+    url,
     urlWithoutQuery: URL.format(urlObject)
   };
   if (compressed) {
diff --git a/directives/textareaAutoHeight.js b/directives/textareaAutoHeight.js
index 6914d99d3..243220183 100644
--- a/directives/textareaAutoHeight.js
+++ b/directives/textareaAutoHeight.js
@@ -1,8 +1,8 @@
 export default {
   name: "textareaAutoHeight",
-  update(element) {
-    if (element.scrollHeight !== element.clientHeight) {
-      element.style.minHeight = `${element.scrollHeight}px`;
+  update({scrollHeight, clientHeight, style}) {
+    if (scrollHeight !== clientHeight) {
+      style.minHeight = `${scrollHeight}px`;
     }
   }
 }
diff --git a/store/mutations.js b/store/mutations.js
index 00e9590ee..5faad275a 100644
--- a/store/mutations.js
+++ b/store/mutations.js
@@ -1,73 +1,73 @@
 export default {
-  setState(state, object) {
-    state.request[object.attribute] = object.value
+  setState({request}, {attribute, value}) {
+    request[attribute] = value
   },
 
-  setGQLState(state, object) {
-    state.gql[object.attribute] = object.value;
+  setGQLState({gql}, {attribute, value}) {
+    gql[attribute] = value;
   },
 
-  addGQLHeader(state, object) {
-    state.gql.headers.push(object);
+  addGQLHeader({gql}, object) {
+    gql.headers.push(object);
   },
 
-  removeGQLHeader(state, index) {
-    state.gql.headers.splice(index, 1);
+  removeGQLHeader({gql}, index) {
+    gql.headers.splice(index, 1);
   },
 
-  setGQLHeaderKey(state, object) {
-    state.gql.headers[object.index].key = object.value;
+  setGQLHeaderKey({gql}, {index, value}) {
+    gql.headers[index].key = value;
   },
 
-  setGQLHeaderValue(state, object) {
-    state.gql.headers[object.index].value = object.value;
+  setGQLHeaderValue({gql}, {index, value}) {
+    gql.headers[index].value = value;
   },
 
-  addHeaders(state, value) {
-    state.request.headers.push(value);
+  addHeaders({request}, value) {
+    request.headers.push(value);
   },
 
-  removeHeaders(state, index) {
-    state.request.headers.splice(index, 1)
+  removeHeaders({request}, index) {
+    request.headers.splice(index, 1)
   },
 
-  setKeyHeader(state, object) {
-    state.request.headers[object.index].key = object.value
+  setKeyHeader({request}, {index, value}) {
+    request.headers[index].key = value
   },
 
-  setValueHeader(state, object) {
-    state.request.headers[object.index].value = object.value
+  setValueHeader({request}, {index, value}) {
+    request.headers[index].value = value
   },
 
-  addParams(state, value) {
-    state.request.params.push(value);
+  addParams({request}, value) {
+    request.params.push(value);
   },
 
-  removeParams(state, index) {
-    state.request.params.splice(index, 1)
+  removeParams({request}, index) {
+    request.params.splice(index, 1)
   },
 
-  setKeyParams(state, object) {
-    state.request.params[object.index].key = object.value
+  setKeyParams({request}, {index, value}) {
+    request.params[index].key = value
   },
 
-  setValueParams(state, object) {
-    state.request.params[object.index].value = object.value
+  setValueParams({request}, {index, value}) {
+    request.params[index].value = value
   },
 
-  addBodyParams(state, value) {
-    state.request.bodyParams.push(value);
+  addBodyParams({request}, value) {
+    request.bodyParams.push(value);
   },
 
-  removeBodyParams(state, index) {
-    state.request.bodyParams.splice(index, 1)
+  removeBodyParams({request}, index) {
+    request.bodyParams.splice(index, 1)
   },
 
-  setKeyBodyParams(state, object) {
-    state.request.bodyParams[object.index].key = object.value
+  setKeyBodyParams({request}, {index, value}) {
+    request.bodyParams[index].key = value
   },
 
-  setValueBodyParams(state, object) {
-    state.request.bodyParams[object.index].value = object.value
+  setValueBodyParams({request}, {index, value}) {
+    request.bodyParams[index].value = value
   },
 };
diff --git a/store/postwoman.js b/store/postwoman.js
index 0229fa4de..4667ab6f9 100644
--- a/store/postwoman.js
+++ b/store/postwoman.js
@@ -72,7 +72,7 @@ export const state = () => ({
 
 export const mutations = {
 
-  applySetting(state, setting) {
+  applySetting({settings}, setting) {
     if (setting == null || !(setting instanceof Array) || setting.length !== 2) {
       throw new Error("You must provide a setting (array in the form [key, value])");
     }
@@ -83,10 +83,10 @@ export const mutations = {
     // top of the file.
     // This is to ensure that application settings remain documented.
     if (!SETTINGS_KEYS.includes(key)) {
-      throw new Error("The settings structure does not include the key " + key);
+      throw new Error(`The settings structure does not include the key ${key}`);
     }
 
-    state.settings[key] = value;
+    settings[key] = value;
   },
 
   replaceCollections(state, collections) {
@@ -103,8 +103,8 @@ export const mutations = {
     }
   },
 
-  addNewCollection(state, collection) {
-    state.collections.push({
+  addNewCollection({collections}, collection) {
+    collections.push({
       name: '',
       folders: [],
       requests: [],
@@ -112,65 +112,65 @@ export const mutations = {
     })
   },
 
-  removeCollection(state, payload) {
+  removeCollection({collections}, payload) {
     const {
       collectionIndex
     } = payload;
-    state.collections.splice(collectionIndex, 1)
+    collections.splice(collectionIndex, 1)
   },
 
-  editCollection(state, payload) {
+  editCollection({collections}, payload) {
     const {
       collection,
       collectionIndex
     } = payload
-    state.collections[collectionIndex] = collection
+    collections[collectionIndex] = collection
   },
 
-  addNewFolder(state, payload) {
+  addNewFolder({collections}, payload) {
     const {
       collectionIndex,
       folder
     } = payload;
-    state.collections[collectionIndex].folders.push({
+    collections[collectionIndex].folders.push({
       name: '',
       requests: [],
       ...folder,
     });
   },
 
-  editFolder(state, payload) {
+  editFolder({collections}, payload) {
     const {
       collectionIndex,
       folder,
       folderIndex
     } = payload;
-    Vue.set(state.collections[collectionIndex].folders, folderIndex, folder)
+    Vue.set(collections[collectionIndex].folders, folderIndex, folder)
   },
 
-  removeFolder(state, payload) {
+  removeFolder({collections}, payload) {
     const {
       collectionIndex,
       folderIndex
     } = payload;
-    state.collections[collectionIndex].folders.splice(folderIndex, 1)
+    collections[collectionIndex].folders.splice(folderIndex, 1)
   },
 
-  addRequest(state, payload) {
+  addRequest({collections}, payload) {
     const {
       request
     } = payload;
 
     // Request that is directly attached to collection
     if (request.folder === -1) {
-      state.collections[request.collection].requests.push(request);
+      collections[request.collection].requests.push(request);
       return
     }
 
-    state.collections[request.collection].folders[request.folder].requests.push(request);
+    collections[request.collection].folders[request.folder].requests.push(request);
   },
 
-  editRequest(state, payload) {
+  editRequest({collections}, payload) {
     const {
       requestOldCollectionIndex,
       requestOldFolderIndex,
@@ -186,24 +186,24 @@ export const mutations = {
 
     // set new request
     if (requestNewFolderIndex !== undefined) {
-      Vue.set(state.collections[requestNewCollectionIndex].folders[requestNewFolderIndex].requests, requestOldIndex, requestNew)
+      Vue.set(collections[requestNewCollectionIndex].folders[requestNewFolderIndex].requests, requestOldIndex, requestNew)
     }
     else {
-      Vue.set(state.collections[requestNewCollectionIndex].requests, requestOldIndex, requestNew)
+      Vue.set(collections[requestNewCollectionIndex].requests, requestOldIndex, requestNew)
     }
 
     // remove old request
     if (changedPlace) {
       if (requestOldFolderIndex !== undefined) {
-        state.collections[requestOldCollectionIndex].folders[requestOldFolderIndex].requests.splice(requestOldIndex, 1)
+        collections[requestOldCollectionIndex].folders[requestOldFolderIndex].requests.splice(requestOldIndex, 1)
       }
       else {
-        state.collections[requestOldCollectionIndex].requests.splice(requestOldIndex, 1)
+        collections[requestOldCollectionIndex].requests.splice(requestOldIndex, 1)
       }
     }
   },
 
-  saveRequestAs(state, payload) {
+  saveRequestAs({collections}, payload) {
     const {
       request,
       collectionIndex,
@@ -216,24 +216,24 @@ export const mutations = {
     const specifiedRequest = requestIndex !== undefined
 
     if (specifiedCollection && specifiedFolder && specifiedRequest) {
-      Vue.set(state.collections[collectionIndex].folders[folderIndex].requests, requestIndex, request)
+      Vue.set(collections[collectionIndex].folders[folderIndex].requests, requestIndex, request)
     }
     else if (specifiedCollection && specifiedFolder && !specifiedRequest) {
-      const requests = state.collections[collectionIndex].folders[folderIndex].requests
+      const requests = collections[collectionIndex].folders[folderIndex].requests
       const lastRequestIndex = requests.length - 1;
       Vue.set(requests, lastRequestIndex + 1, request)
     } else if (specifiedCollection && !specifiedFolder && specifiedRequest) {
-      const requests = state.collections[collectionIndex].requests
+      const requests = collections[collectionIndex].requests
       Vue.set(requests, requestIndex, request)
     } else if (specifiedCollection && !specifiedFolder && !specifiedRequest) {
-      const requests = state.collections[collectionIndex].requests
+      const requests = collections[collectionIndex].requests
       const lastRequestIndex = requests.length - 1;
       Vue.set(requests, lastRequestIndex + 1, request)
     }
 
   },
 
-  saveRequest(state, payload) {
+  saveRequest({collections}, payload) {
     const {
       request
     } = payload;
@@ -242,12 +242,12 @@ export const mutations = {
     if (request.hasOwnProperty('oldCollection') && request.oldCollection > -1) {
       const folder = request.hasOwnProperty('oldFolder') && request.oldFolder >= -1 ? request.oldFolder : request.folder;
       if (folder > -1) {
-        state.collections[request.oldCollection].folders[folder].requests.splice(request.requestIndex, 1)
+        collections[request.oldCollection].folders[folder].requests.splice(request.requestIndex, 1)
       } else {
-        state.collections[request.oldCollection].requests.splice(request.requestIndex, 1)
+        collections[request.oldCollection].requests.splice(request.requestIndex, 1)
       }
     } else if (request.hasOwnProperty('oldFolder') && request.oldFolder !== -1) {
-      state.collections[request.collection].folders[folder].requests.splice(request.requestIndex, 1)
+      collections[request.collection].folders[folder].requests.splice(request.requestIndex, 1)
     }
 
     delete request.oldCollection;
@@ -255,14 +255,14 @@ export const mutations = {
 
     // Request that is directly attached to collection
     if (request.folder === -1) {
-      Vue.set(state.collections[request.collection].requests, request.requestIndex, request)
+      Vue.set(collections[request.collection].requests, request.requestIndex, request)
       return
     }
 
-    Vue.set(state.collections[request.collection].folders[request.folder].requests, request.requestIndex, request)
+    Vue.set(collections[request.collection].folders[request.folder].requests, request.requestIndex, request)
   },
 
-  removeRequest(state, payload) {
+  removeRequest({collections}, payload) {
     const {
       collectionIndex,
       folderIndex,
@@ -271,15 +271,15 @@ export const mutations = {
 
     // Request that is directly attached to collection
     if (folderIndex === -1) {
-      state.collections[collectionIndex].requests.splice(requestIndex, 1)
+      collections[collectionIndex].requests.splice(requestIndex, 1)
       return
     }
 
-    state.collections[collectionIndex].folders[folderIndex].requests.splice(requestIndex, 1)
+    collections[collectionIndex].folders[folderIndex].requests.splice(requestIndex, 1)
   },
 
-  selectRequest(state, payload) {
-    state.selectedRequest = Object.assign({}, payload.request);
+  selectRequest(state, {request}) {
+    state.selectedRequest = Object.assign({}, request);
   },
 
 };