diff --git a/src/client/actions/SocketActions.js b/src/client/actions/SocketActions.js
index 6865bc5..f017d14 100644
--- a/src/client/actions/SocketActions.js
+++ b/src/client/actions/SocketActions.js
@@ -42,7 +42,7 @@ class SocketHandler {
     .filter(id => !newUsersMap[id])
     .forEach(id => peers[id].destroy())
   }
-  handleMessages = ({ messages }) => {
+  handleMessages = (messages) => {
     const { dispatch } = this
     debug('socket messages: %o', messages)
     dispatch(ChatActions.loadHistory(messages))
diff --git a/src/client/components/Chat.js b/src/client/components/Chat.js
index 1518d38..d63432c 100644
--- a/src/client/components/Chat.js
+++ b/src/client/components/Chat.js
@@ -12,7 +12,7 @@ export default class Chat extends React.PureComponent {
   static propTypes = {
     messages: PropTypes.arrayOf(MessagePropTypes).isRequired
   }
-  hideChat = e => {
+  handleCloseChat = e => {
     document.getElementById('chat').classList.remove('show')
     document.querySelector('.toolbar .chat').classList.remove('on')
   }
@@ -21,7 +21,7 @@ export default class Chat extends React.PureComponent {
     return (
       <div>
         <div className="chat-header">
-          <div className="chat-close" onClick={this.hideChat}>
+          <div className="chat-close" onClick={this.handleCloseChat}>
             <div className="button button-icon">
               <span className="material-icons">arrow_back</span>
             </div>
@@ -32,13 +32,19 @@ export default class Chat extends React.PureComponent {
 
           {messages.length ? (
             messages.map((message, i) => (
-              <div className={message.userId === socket.id ? 'chat-bubble alt' : 'chat-bubble'} key={i}>
+              <div key={i}
+                className={
+                  message.userId === socket.id
+                    ? 'chat-bubble alt'
+                    : 'chat-bubble'
+                }
+              >
                 <div className="txt">
                   <p className="name">{message.userId}</p>
                   <p className="message">{message.message}</p>
                   <span className="timestamp">{message.timestamp}</span>
                 </div>
-                <div className="arrow"></div>
+                <div className="arrow" />
               </div>
             ))
           ) : (
diff --git a/src/client/components/Input.js b/src/client/components/Input.js
index 10ef6e0..1f8a313 100644
--- a/src/client/components/Input.js
+++ b/src/client/components/Input.js
@@ -36,8 +36,8 @@ export default class Input extends React.PureComponent {
       notify('You: ' + message)
       sendMessage(message)
 
-      const userId = socket.id;
-      const timestamp = moment().format('ddd, D MMM HH:mm a');
+      const userId = socket.id
+      const timestamp = moment().format('ddd, D MMM HH:mm a')
       const payload = { userId, message, timestamp }
       socket.emit('new_message', payload)
     }
diff --git a/src/client/reducers/messages.js b/src/client/reducers/messages.js
index 005a943..505c7d2 100644
--- a/src/client/reducers/messages.js
+++ b/src/client/reducers/messages.js
@@ -10,7 +10,7 @@ export default function messages (state = defaultState, action) {
       messages.push(action.payload)
       return Immutable(messages)
     case constants.MESSAGES_HISTORY:
-      return Immutable(action.messages);
+      return Immutable(action.messages)
     default:
       return state
   }
diff --git a/src/server/__tests__/socket-test.js b/src/server/__tests__/socket-test.js
index 04de632..8d13e72 100644
--- a/src/server/__tests__/socket-test.js
+++ b/src/server/__tests__/socket-test.js
@@ -83,19 +83,22 @@ describe('server/socket', () => {
       it('should emit users', () => {
         socket.emit('ready', 'room3')
 
-        expect(io.to.mock.calls).toEqual([[ 'room3' ]])
-        expect(io.to('room3').emit.mock.calls).toEqual([[
-          'users', {
-            initiator: 'socket0',
-            users: [{
-              id: 'socket0'
-            }, {
-              id: 'socket1'
-            }, {
-              id: 'socket2'
-            }]
-          }
-        ]])
+        expect(io.to.mock.calls).toEqual([[ 'room3' ], [ 'room3' ]])
+        expect(io.to('room3').emit.mock.calls).toEqual([
+          [
+            'users', {
+              initiator: 'socket0',
+              users: [{
+                id: 'socket0'
+              }, {
+                id: 'socket1'
+              }, {
+                id: 'socket2'
+              }]
+            }
+          ],
+          ['messages', []]
+        ])
       })
     })
   })
diff --git a/src/server/socket.js b/src/server/socket.js
index 0224922..a9dd036 100644
--- a/src/server/socket.js
+++ b/src/server/socket.js
@@ -2,11 +2,11 @@
 const debug = require('debug')('peer-calls:socket')
 const _ = require('underscore')
 
-const messages = {};
+const messages = {}
 
 module.exports = function (socket, io) {
   socket.on('signal', payload => {
-    // debug('signal: %s, payload: %o', socket.id, payload);
+    // debug('signal: %s, payload: %o', socket.id, payload)
     io.to(payload.userId).emit('signal', {
       userId: socket.id,
       signal: payload.signal
@@ -14,7 +14,7 @@ module.exports = function (socket, io) {
   })
 
   socket.on('new_message', payload => {
-    addMesssage(socket.room, payload);
+    addMesssage(socket.room, payload)
     io.to(socket.room).emit('new_message', payload)
   })
 
@@ -27,12 +27,16 @@ module.exports = function (socket, io) {
 
     let users = getUsers(roomName)
     let messages = getMesssages(roomName)
-    debug('ready: %s, room: %s, users: %o, messages: %o', socket.id, roomName, users, messages)
+
+    debug('ready: %s, room: %s, users: %o, messages: %o',
+      socket.id, roomName, users, messages)
+
     io.to(roomName).emit('users', {
       initiator: socket.id,
       users
     })
-    io.to(roomName).emit('messages', { messages })
+
+    io.to(roomName).emit('messages', messages)
   })
 
   function getUsers (roomName) {
@@ -43,7 +47,7 @@ module.exports = function (socket, io) {
 
   function getMesssages (roomName) {
     if (_.isUndefined(messages[roomName])) {
-      messages[roomName] = [];
+      messages[roomName] = []
     }
     return messages[roomName]
   }