diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 2dfc1eeb34..d551a6fe27 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -175,7 +175,9 @@ export default class ContextualMenu extends React.Component {
             `;
         }
 
-        const chevron = hasChevron ? <div style={chevronOffset} className={"mx_ContextualMenu_chevron_" + chevronFace} /> : undefined;
+        const chevron = hasChevron ?
+            <div style={chevronOffset} className={"mx_ContextualMenu_chevron_" + chevronFace} /> :
+            undefined;
         const className = 'mx_ContextualMenu_wrapper';
 
         const menuClasses = classNames({
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index ebc559b5fc..226b4a4ba4 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -29,8 +29,6 @@ import AccessibleButton from '../../components/views/elements/AccessibleButton';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
 
-import { formatCount } from '../../utils/FormattingUtils';
-
 class HeaderButton extends React.Component {
     constructor() {
         super();
@@ -52,11 +50,7 @@ class HeaderButton extends React.Component {
         const classes = classNames({
             mx_RightPanel_headerButton: true,
             mx_RightPanel_headerButton_highlight: this.props.isHighlighted,
-        })
-        // will probably use this later on for notifications, etc ...
-        /* <div className="mx_RightPanel_headerButton_badge">
-            { this.props.badge ? this.props.badge : <span>&nbsp;</span> }
-        </div> */
+        });
 
         return <AccessibleButton
             aria-label={this.props.title}
@@ -263,10 +257,11 @@ module.exports = React.createClass({
 
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
+        // eslint-disable-next-line no-unused-vars
         let inviteGroup;
 
         let membersBadge;
-        let membersTitle = _t('Members');
+        const membersTitle = _t('Members');
 
         const isPhaseGroup = [
             this.Phase.GroupMemberInfo,
diff --git a/src/components/structures/TopLeftMenuButton.js b/src/components/structures/TopLeftMenuButton.js
index ab977a1d98..71ca382e92 100644
--- a/src/components/structures/TopLeftMenuButton.js
+++ b/src/components/structures/TopLeftMenuButton.js
@@ -62,7 +62,7 @@ export default class TopLeftMenuButton extends React.Component {
         try {
             const profileInfo = await this._getProfileInfo();
             this.setState({profileInfo});
-        } catch(ex) {
+        } catch (ex) {
             console.log("could not fetch profile");
             console.error(ex);
         }
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index c72ed2517a..6d99b54ce2 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -56,6 +56,6 @@ export default class DateSeparator extends React.Component {
     }
 
     render() {
-        return <h2 className="mx_DateSeparator"><hr/><date>{ this.getLabel() }</date><hr/></h2>;
+        return <h2 className="mx_DateSeparator"><hr /><date>{ this.getLabel() }</date><hr /></h2>;
     }
 }