diff --git a/.codeclimate.yml b/.codeclimate.yml
index 04fe87d7..f7e53999 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -7,6 +7,11 @@ engines:
       languages:
         javascript:
           mass_threshold: 65
+  shellcheck:
+    enabled: true
+checks:
+  method-count:
+    enabled: false
 ratings:
    paths:
    - "**.js"
\ No newline at end of file
diff --git a/src/services/MergeRequests.js b/src/services/MergeRequests.js
index 0ec1e06c..ed62dd97 100644
--- a/src/services/MergeRequests.js
+++ b/src/services/MergeRequests.js
@@ -15,17 +15,13 @@ class MergeRequests extends BaseService {
 
   approvals(projectId, { mergerequestId } = {}) {
     const pId = encodeURIComponent(projectId);
-    const mergeRequest = mergerequestId
-      ? `merge_requests/${encodeURIComponent(mergerequestId)}`
-      : '';
+    const mergeRequest = mergerequestId ? `merge_requests/${encodeURIComponent(mergerequestId)}` : '';
 
     return RequestHelper.get(this, `projects/${pId}/${mergeRequest}/approvals`);
   }
 
   all({ projectId, ...options } = {}) {
-    const url = projectId
-      ? `projects/${encodeURIComponent(projectId)}/merge_requests`
-      : 'merge_requests';
+    const url = projectId ? `projects/${encodeURIComponent(projectId)}/merge_requests` : 'merge_requests';
 
     return RequestHelper.get(this, url, options);
   }
@@ -33,10 +29,7 @@ class MergeRequests extends BaseService {
   cancelOnPipelineSucess(projectId, mergerequestId) {
     const [pId, mId] = [projectId, mergerequestId].map(encodeURIComponent);
 
-    return RequestHelper.put(
-      this,
-      `projects/${pId}/merge_requests/${mId}/cancel_merge_when_pipeline_succeeds`,
-    );
+    return RequestHelper.put(this, `projects/${pId}/merge_requests/${mId}/cancel_merge_when_pipeline_succeeds`);
   }
 
   changes(projectId, mergerequestId) {
@@ -77,18 +70,14 @@ class MergeRequests extends BaseService {
 
   editApprovals(projectId, { mergerequestId, ...options }) {
     const pId = encodeURIComponent(projectId);
-    const mergeRequest = mergerequestId
-      ? `merge_requests/${encodeURIComponent(mergerequestId)}/`
-      : '';
+    const mergeRequest = mergerequestId ? `merge_requests/${encodeURIComponent(mergerequestId)}` : '';
 
     return RequestHelper.get(this, `projects/${pId}/${mergeRequest}approvals`, options);
   }
 
   editApprovers(projectId, { mergerequestId, ...options }) {
     const pId = encodeURIComponent(projectId);
-    const mergeRequest = mergerequestId
-      ? `merge_requests/${encodeURIComponent(mergerequestId)}/`
-      : '';
+    const mergeRequest = mergerequestId ? `merge_requests/${encodeURIComponent(mergerequestId)}` : '';
 
     return RequestHelper.get(this, `projects/${pId}/${mergeRequest}approvers`, options);
   }
diff --git a/src/services/UserGPGKeys.js b/src/services/UserGPGKeys.js
index e868f471..8981162b 100644
--- a/src/services/UserGPGKeys.js
+++ b/src/services/UserGPGKeys.js
@@ -1,16 +1,14 @@
 import { BaseService, RequestHelper } from '../infrastructure';
 
+const url = userId => (userId ? `users/${encodeURIComponent(userId)}/gpg_keys` : 'users/gpg_keys');
+
 class UserGPGKeys extends BaseService {
   all({ userId } = {}) {
-    const url = userId ? `users/${encodeURIComponent(userId)}/gpg_keys` : 'users/gpg_keys';
-
-    return RequestHelper.get(this, url);
+    return RequestHelper.get(this, url(userId));
   }
 
   add(title, key, { userId } = {}) {
-    const url = userId ? `users/${encodeURIComponent(userId)}/gpg_keys` : 'users/gpg_keys';
-
-    return RequestHelper.post(this, url, {
+    return RequestHelper.post(this, url(userId), {
       title,
       key,
     });
@@ -18,16 +16,14 @@ class UserGPGKeys extends BaseService {
 
   show(keyId, { userId } = {}) {
     const kId = encodeURIComponent(keyId);
-    const url = userId ? `users/${encodeURIComponent(userId)}/gpg_keys` : 'users/gpg_keys';
 
-    return RequestHelper.get(this, `${url}/${kId}`);
+    return RequestHelper.get(this, `${url(userId)}/${kId}`);
   }
 
   remove(keyId, { userId } = {}) {
     const kId = encodeURIComponent(keyId);
-    const url = userId ? `users/${encodeURIComponent(userId)}/gpg_keys` : 'users/gpg_keys';
 
-    return RequestHelper.delete(this, `${url}/${kId}`);
+    return RequestHelper.delete(this, `${url(userId)}/${kId}`);
   }
 }