diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index edc918e2a4..f1053618dc 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -269,17 +269,19 @@ export default React.createClass({
                 break;
 
             case PageTypes.HomePage:
-                // If team server config is present, pass the teamServerURL. props.teamToken
-                // must also be set for the team page to be displayed, otherwise the
-                // welcomePageUrl is used (which might be undefined).
-                const teamServerUrl = this.props.config.teamServerConfig ?
-                    this.props.config.teamServerConfig.teamServerURL : null;
+                {
+                    // If team server config is present, pass the teamServerURL. props.teamToken
+                    // must also be set for the team page to be displayed, otherwise the
+                    // welcomePageUrl is used (which might be undefined).
+                    const teamServerUrl = this.props.config.teamServerConfig ?
+                        this.props.config.teamServerConfig.teamServerURL : null;
 
-                page_element = <HomePage
-                    teamServerUrl={teamServerUrl}
-                    teamToken={this.props.teamToken}
-                    homePageUrl={this.props.config.welcomePageUrl}
-                />;
+                    page_element = <HomePage
+                        teamServerUrl={teamServerUrl}
+                        teamToken={this.props.teamToken}
+                        homePageUrl={this.props.config.welcomePageUrl}
+                    />;
+                }
                 break;
 
             case PageTypes.UserView:
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 222e424b2d..fba6f69d99 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -40,7 +40,7 @@ const GroupTile = React.createClass({
 
     render: function() {
         return <a onClick={this.onClick} href="#">{this.props.groupId}</a>;
-    }
+    },
 });
 
 export default WithMatrixClient(React.createClass({
@@ -84,12 +84,12 @@ export default WithMatrixClient(React.createClass({
 
         let content;
         if (this.state.groups) {
-            let groupNodes = [];
+            const groupNodes = [];
             this.state.groups.forEach((g) => {
                 groupNodes.push(
                     <div key={g}>
                         <GroupTile groupId={g} />
-                    </div>
+                    </div>,
                 );
             });
             content = <div>
@@ -117,7 +117,7 @@ export default WithMatrixClient(React.createClass({
                     {_t(
                         'Create a group to represent your community! '+
                         'Define a set of rooms and your own custom homepage '+
-                        'to mark out your space in the Matrix universe.'
+                        'to mark out your space in the Matrix universe.',
                     )}
                 </div>
                 <div className="mx_MyGroups_joinBox">
diff --git a/src/components/views/avatars/GroupAvatar.js b/src/components/views/avatars/GroupAvatar.js
index 15c71e59d5..506714e857 100644
--- a/src/components/views/avatars/GroupAvatar.js
+++ b/src/components/views/avatars/GroupAvatar.js
@@ -38,7 +38,7 @@ export default React.createClass({
         };
     },
 
-    getGroupAvatarUrl: function(props) {
+    getGroupAvatarUrl: function() {
         return MatrixClientPeg.get().mxcUrlToHttp(
             this.props.groupAvatarUrl,
             this.props.width,
@@ -50,6 +50,8 @@ export default React.createClass({
     render: function() {
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
         // extract the props we use from props so we can pass any others through
+        // should consider adding this as a global rule in js-sdk?
+        /*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
         const {groupId, groupAvatarUrl, ...otherProps} = this.props;
 
         return (
@@ -60,5 +62,5 @@ export default React.createClass({
                 {...otherProps}
             />
         );
-    }
+    },
 });