diff --git a/src/ElkClient.ts b/src/ElkClient.ts
index d7ada7d5..a41c8c25 100644
--- a/src/ElkClient.ts
+++ b/src/ElkClient.ts
@@ -277,7 +277,7 @@ class ElkClient extends ElkClientCommands {
           // for multiple packets at once.
           data.split(/\r\n|\r|\n/).forEach(packet => {
             if (packet) {
-              if (packet == 'OK') {
+              if (packet === 'OK') {
                 this.emit('ok');
               } else {
                 this.emit('message', parseElkResponse(packet + '\r\n'));
diff --git a/src/ElkClientEvents.ts b/src/ElkClientEvents.ts
index 4f339b62..4cea77bb 100644
--- a/src/ElkClientEvents.ts
+++ b/src/ElkClientEvents.ts
@@ -16,13 +16,7 @@ export default interface ElkClientEvents {
   /**
    * Emitted when authentication has begun
    */
-  addListener(event: 'authenticating', listener: Listener): this;
-
-  /**
-   *
-   * Emitted when successfully authenticated
-   */
-  addListener(event: 'authenticated', listener: Listener): this;
+  addListener(event: 'authenticating' | 'authenticated', listener: Listener): this;
 
   /**
    * Emitted whenever the underlying connection disconnects
@@ -43,44 +37,38 @@ export default interface ElkClientEvents {
   addListener(event: 'ok', listener: DataListener): this;
 
   removeListener(event: 'message', listener: MessageListener): this;
-  removeListener(event: 'authenticating', listener: Listener): this;
-  removeListener(event: 'authenticated', listener: Listener): this;
+  removeListener(event: 'authenticating' | 'authenticated', listener: Listener): this;
   removeListener(event: 'disconnected', listener: DisconnectedListener): this;
   removeListener(event: 'error', listener: ErrorListener): this;
   removeListener(event: 'ok', listener: DataListener): this;
 
   on(event: 'message', listener: MessageListener): this;
-  on(event: 'authenticating', listener: Listener): this;
-  on(event: 'authenticated', listener: Listener): this;
+  on(event: 'authenticating' | 'authenticated', listener: Listener): this;
   on(event: 'disconnected', listener: DisconnectedListener): this;
   on(event: 'error', listener: ErrorListener): this;
   on(event: 'ok', listener: DataListener): this;
 
   once(event: 'message', listener: MessageListener): this;
-  once(event: 'authenticating', listener: Listener): this;
-  once(event: 'authenticated', listener: Listener): this;
+  once(event: 'authenticating' | 'authenticated', listener: Listener): this;
   once(event: 'disconnected', listener: DisconnectedListener): this;
   once(event: 'error', listener: ErrorListener): this;
   once(event: 'ok', listener: DataListener): this;
 
   prependListener(event: 'message', listener: MessageListener): this;
-  prependListener(event: 'authenticating', listener: Listener): this;
-  prependListener(event: 'authenticated', listener: Listener): this;
+  prependListener(event: 'authenticating' | 'authenticated', listener: Listener): this;
   prependListener(event: 'disconnected', listener: DisconnectedListener): this;
   prependListener(event: 'error', listener: ErrorListener): this;
   prependListener(event: 'ok', listener: DataListener): this;
 
   prependOnceListener(event: 'message', listener: MessageListener): this;
-  prependOnceListener(event: 'authenticating', listener: Listener): this;
-  prependOnceListener(event: 'authenticated', listener: Listener): this;
+  prependOnceListener(event: 'authenticating' | 'authenticated', listener: Listener): this;
   prependOnceListener(event: 'disconnected', listener: DisconnectedListener): this;
   prependOnceListener(event: 'error', listener: ErrorListener): this;
   prependOnceListener(event: 'ok', listener: DataListener): this;
 
   emit(event: string | symbol, ...args: any[]): boolean;
   emit(event: 'message', message: ElkMessage): void;
-  emit(event: 'authenticating'): void;
-  emit(event: 'authenticated'): void;
+  emit(event: 'authenticating' | 'authenticated'): void;
   emit(event: 'disconnected', error?: Error): void;
   emit(event: 'error', error: Error): void;
   emit(event: 'ok', raw: string): void;
diff --git a/src/connection/ElkConnection.ts b/src/connection/ElkConnection.ts
index 18ef5ef7..736fb150 100644
--- a/src/connection/ElkConnection.ts
+++ b/src/connection/ElkConnection.ts
@@ -18,22 +18,13 @@ export const STATE_CHANGE_EVENT_NAMES: { [P in ElkConnectionState]: string } = {
 
 export default interface ElkConnection {
   /**
-   * Emitted whenever the connection state has changed to 'connecting'
-   * @event
-   */
-  addListener(event: 'connecting', listener: StateChangeListener): this;
-
-  /**
-   * Emitted whenever the connection state has changed to 'connected'
-   * @event
-   */
-  addListener(event: 'connected', listener: StateChangeListener): this;
-
-  /**
-   * Emitted whenever the connection state has changed to 'disconnecting'
+   * Emitted whenever the connection state has changed.
    * @event
    */
-  addListener(event: 'disconnecting', listener: StateChangeListener): this;
+  addListener(
+    event: 'connecting' | 'connected' | 'disconnecting',
+    listener: StateChangeListener
+  ): this;
 
   /**
    * Emitted whenever the connection state has changed.
@@ -53,45 +44,45 @@ export default interface ElkConnection {
    */
   addListener(event: 'data', listener: DataListener): this;
 
-  removeListener(event: 'connecting', listener: StateChangeListener): this;
-  removeListener(event: 'connected', listener: StateChangeListener): this;
-  removeListener(event: 'disconnecting', listener: StateChangeListener): this;
+  removeListener(
+    event: 'connecting' | 'connected' | 'disconnecting',
+    listener: StateChangeListener
+  ): this;
   removeListener(event: 'disconnected', listener: DisconnectedListener): this;
   removeListener(event: 'error', listener: ErrorListener): this;
   removeListener(event: 'data', listener: DataListener): this;
 
-  on(event: 'connecting', listener: StateChangeListener): this;
-  on(event: 'connected', listener: StateChangeListener): this;
-  on(event: 'disconnecting', listener: StateChangeListener): this;
+  on(event: 'connecting' | 'connected' | 'disconnecting', listener: StateChangeListener): this;
   on(event: 'disconnected', listener: DisconnectedListener): this;
   on(event: 'error', listener: ErrorListener): this;
   on(event: 'data', listener: DataListener): this;
 
-  once(event: 'connecting', listener: StateChangeListener): this;
-  once(event: 'connected', listener: StateChangeListener): this;
-  once(event: 'disconnecting', listener: StateChangeListener): this;
+  once(event: 'connecting' | 'connected' | 'disconnecting', listener: StateChangeListener): this;
   once(event: 'disconnected', listener: DisconnectedListener): this;
   once(event: 'error', listener: ErrorListener): this;
   once(event: 'data', listener: DataListener): this;
 
-  prependListener(event: 'connecting', listener: StateChangeListener): this;
-  prependListener(event: 'connected', listener: StateChangeListener): this;
-  prependListener(event: 'disconnecting', listener: StateChangeListener): this;
+  prependListener(
+    event: 'connecting' | 'connected' | 'disconnecting',
+    listener: StateChangeListener
+  ): this;
   prependListener(event: 'disconnected', listener: DisconnectedListener): this;
   prependListener(event: 'error', listener: ErrorListener): this;
   prependListener(event: 'data', listener: DataListener): this;
 
-  prependOnceListener(event: 'connecting', listener: StateChangeListener): this;
-  prependOnceListener(event: 'connected', listener: StateChangeListener): this;
-  prependOnceListener(event: 'disconnecting', listener: StateChangeListener): this;
+  prependOnceListener(
+    event: 'connecting' | 'connected' | 'disconnecting',
+    listener: StateChangeListener
+  ): this;
   prependOnceListener(event: 'disconnected', listener: DisconnectedListener): this;
   prependOnceListener(event: 'error', listener: ErrorListener): this;
   prependOnceListener(event: 'data', listener: DataListener): this;
 
   emit(event: string | symbol, ...args: any[]): boolean;
-  emit(event: 'connecting', previousState: ElkConnectionState): void;
-  emit(event: 'connected', previousState: ElkConnectionState): void;
-  emit(event: 'disconnecting', previousState: ElkConnectionState): void;
+  emit(
+    event: 'connecting' | 'connected' | 'disconnecting',
+    previousState: ElkConnectionState
+  ): void;
   emit(event: 'disconnected', previousState: ElkConnectionState, error?: Error): void;
   emit(event: 'error', error: Error): void;
   emit(event: 'data', data: string): void;