diff --git a/client/src/js/actions/channel.js b/client/src/js/actions/channel.js
index 68d675e8..fd05781b 100644
--- a/client/src/js/actions/channel.js
+++ b/client/src/js/actions/channel.js
@@ -18,34 +18,20 @@ var channelActions = Reflux.createActions([
 	'load'
 ]);
 
-channelActions.join.preEmit = function(channels, server) {
-	socket.send('join', {
-		server: server,
-		channels: channels
-	});
+channelActions.join.preEmit = (channels, server) => {
+	socket.send('join', { server, channels });
 };
 
-channelActions.part.preEmit = function(channels, server) {
-	socket.send('part', {
-		server: server,
-		channels: channels
-	});
+channelActions.part.preEmit = (channels, server) => {
+	socket.send('part', { server, channels });
 };
 
-channelActions.invite.preEmit = function(user, channel, server) {
-	socket.send('invite', {
-		server: server,
-		channel: channel,
-		user: user
-	});
+channelActions.invite.preEmit = (user, channel, server) => {
+	socket.send('invite', { server, channel, user });
 };
 
-channelActions.kick.preEmit = function(user, channel, server) {
-	socket.send('kick', {
-		server: server,
-		channel: channel,
-		user: user
-	});
+channelActions.kick.preEmit = (user, channel, server) => {
+	socket.send('kick', { server, channel, user });
 };
 
 module.exports = channelActions;
\ No newline at end of file
diff --git a/client/src/js/actions/message.js b/client/src/js/actions/message.js
index 4c771ad6..9a3286b5 100644
--- a/client/src/js/actions/message.js
+++ b/client/src/js/actions/message.js
@@ -12,12 +12,8 @@ var messageActions = Reflux.createActions([
 	'setWrapWidth'
 ]);
 
-messageActions.send.preEmit = function(message, to, server) {
-	socket.send('chat', {
-		server: server,
-		to: to,
-		message: message
-	});
+messageActions.send.preEmit = (message, to, server) => {
+	socket.send('chat', { server, to, message });
 };
 
 module.exports = messageActions;
\ No newline at end of file
diff --git a/client/src/js/actions/server.js b/client/src/js/actions/server.js
index 017d5150..d6417f8b 100644
--- a/client/src/js/actions/server.js
+++ b/client/src/js/actions/server.js
@@ -10,10 +10,10 @@ var serverActions = Reflux.createActions([
 	'load'
 ]);
 
-serverActions.connect.preEmit = function(server, nick, opts) {
+serverActions.connect.preEmit = (server, nick, opts) => {
 	socket.send('connect', {
-		server: server,
-		nick: nick,
+		server,
+		nick,
 		username: opts.username || nick,
 		password: opts.password,
 		realname: opts.realname || nick,
@@ -22,20 +22,17 @@ serverActions.connect.preEmit = function(server, nick, opts) {
 	});
 };
 
-serverActions.disconnect.preEmit = function(server) {
-	socket.send('quit', { server: server });
+serverActions.disconnect.preEmit = (server) => {
+	socket.send('quit', { server });
 };
 
-serverActions.whois.preEmit = function(user, server) {
-	socket.send('whois', {
-		server: server,
-		user: user
-	});
+serverActions.whois.preEmit = (user, server) => {
+	socket.send('whois', { server, user });
 };
 
-serverActions.setNick.preEmit = function(nick, server) {
+serverActions.setNick.preEmit = (nick, server) => {
 	socket.send('nick', {
-		server: server,
+		server,
 		new: nick
 	});
 };
diff --git a/client/src/js/actions/tab.js b/client/src/js/actions/tab.js
index 738eb08c..10be863d 100644
--- a/client/src/js/actions/tab.js
+++ b/client/src/js/actions/tab.js
@@ -6,8 +6,6 @@ var tabActions = Reflux.createActions([
 	'select'
 ]);
 
-tabActions.select.preEmit = function() {
-	routeActions.navigate('app');
-};
+tabActions.select.preEmit = () => routeActions.navigate('app');
 
 module.exports = tabActions;
\ No newline at end of file
diff --git a/client/src/js/app.js b/client/src/js/app.js
index 16344f84..4b6906c4 100644
--- a/client/src/js/app.js
+++ b/client/src/js/app.js
@@ -19,13 +19,8 @@ if (!uuid) {
 	localStorage.uuid = uuid = util.UUID();
 }
 
-socket.on('connect', function() {
-	socket.send('uuid', uuid);
-});
-
-socket.on('error', function(error) {
-	console.log(error.server + ': ' + error.message);
-});
+socket.on('connect', () => socket.send('uuid', uuid));
+socket.on('error', (error) => console.log(error.server + ': ' + error.message));
 
 var routes = (
 	<Route name="app" path="/" handler={App}>
diff --git a/client/src/js/components/UserList.jsx b/client/src/js/components/UserList.jsx
index 9bdedcea..06bddff9 100644
--- a/client/src/js/components/UserList.jsx
+++ b/client/src/js/components/UserList.jsx
@@ -41,7 +41,7 @@ var UserList = React.createClass({
 		if (!tab.channel || tab.channel[0] !== '#') {
 			style.display = 'none';
 		} else {
-			users = _.map(channelStore.getUsers(tab.server, tab.channel), function(user) {
+			users = _.map(channelStore.getUsers(tab.server, tab.channel), (user) => {
 				return <UserListItem key={user.nick} user={user} />;
 			});
 		}
diff --git a/client/src/js/socket.js b/client/src/js/socket.js
index 9f085af0..f2e46f73 100644
--- a/client/src/js/socket.js
+++ b/client/src/js/socket.js
@@ -14,7 +14,7 @@ class Socket extends EventEmitter {
 	}
 
 	send(type, data) {
-		this.ws.send(JSON.stringify({ type: type, request: data }));
+		this.ws.send(JSON.stringify({ type, request: data }));
 	}
 }
 
diff --git a/client/src/js/stores/selectedTab.js b/client/src/js/stores/selectedTab.js
index 97a71b05..7f71e5ec 100644
--- a/client/src/js/stores/selectedTab.js
+++ b/client/src/js/stores/selectedTab.js
@@ -57,7 +57,7 @@ var selectedTabStore = Reflux.createStore({
 		if (selectedTab.channel &&
 			server === selectedTab.server &&
 			user === serverStore.getNick(server) &&
-			channel.toLowerCase() === selectedTab.channel.toLowerCase()) {
+			channel.toLowerCase().indexOf(selectedTab.channel.toLowerCase()) !== -1) {
 			selectedTab.channel = channel;
 			selectedTab.name = channel;
 			this.trigger(selectedTab);