diff --git a/src/xo.js b/src/xo.js
index 78ac304d0..9d08428bc 100644
--- a/src/xo.js
+++ b/src/xo.js
@@ -282,7 +282,7 @@ export default class Xo extends EventEmitter {
   }
 
   async deleteUser (id) {
-    if (!await this._users.remove(id)) {
+    if (!await this._users.remove(id)) { // eslint-disable-line space-before-keywords
       throw new NoSuchUser(id)
     }
   }
@@ -360,7 +360,7 @@ export default class Xo extends EventEmitter {
   }
 
   async deleteGroup (id) {
-    if (!await this._groups.remove(id)) {
+    if (!await this._groups.remove(id)) { // eslint-disable-line space-before-keywords
       throw new NoSuchGroup(id)
     }
   }
@@ -713,7 +713,7 @@ export default class Xo extends EventEmitter {
   }
 
   async deleteAuthenticationToken (id) {
-    if (!await this._tokens.remove(id)) {
+    if (!await this._tokens.remove(id)) { // eslint-disable-line space-before-keywords
       throw new NoSuchAuthenticationToken(id)
     }
   }
@@ -741,7 +741,7 @@ export default class Xo extends EventEmitter {
   async unregisterXenServer (id) {
     this.disconnectXenServer(id).catch(() => {})
 
-    if (!await this._servers.remove(id)) {
+    if (!await this._servers.remove(id)) { // eslint-disable-line space-before-keywords
       throw new NoSuchXenServer(id)
     }
   }
@@ -1082,7 +1082,7 @@ export default class Xo extends EventEmitter {
 
     opts.createdAt = Date.now()
 
-    const url = `/${await generateToken()}`
+    const url = `/${await generateToken()}` // eslint-disable-line space-before-keywords
     this._proxyRequests[url] = opts
 
     return url