diff --git a/.eslintrc b/.eslintrc
index 9ae4c93237..2540658dc5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -25,16 +25,10 @@
     "no-param-reassign": 0,
     "no-this-before-super": 2,
     "no-undef": 2,
-    "no-unused-vars": [2, { "vars": "all", "args": "none" }],
     "babel/object-shorthand": 2,
     "react/jsx-boolean-value": [2, "never"],
     "react/jsx-no-duplicate-props": 2,
     "react/prop-types": [2, { "ignore": [ "children", "className", "style" ] }],
-    "react/sort-comp": 0,
-    "space-after-keywords": 0,
-    "space-before-blocks": 0,
-    "space-before-function-paren": 0,
-    "spaced-comment": 0,
-    "vars-on-top": 0
+    "react/sort-comp": 0
   }
 }
diff --git a/docs/build.js b/docs/build.js
index 0b1b973cbe..975f0a6acc 100644
--- a/docs/build.js
+++ b/docs/build.js
@@ -25,7 +25,7 @@ const readmeDest = path.join(docsBuilt, 'README.md');
  * @internal
  */
 function generateHTML(fileName, propData) {
-  return new Promise((resolve, reject) => {
+  return new Promise( resolve => {
     const urlSlug = fileName === 'index.html' ? '/' : `/${fileName}`;
 
     Router.run(routes, urlSlug, Handler => {
diff --git a/docs/examples/Collapse.js b/docs/examples/Collapse.js
index 92b95685d4..f38c4945b8 100644
--- a/docs/examples/Collapse.js
+++ b/docs/examples/Collapse.js
@@ -1,11 +1,11 @@
 class Example extends React.Component {
-  constructor(...args){
+  constructor(...args) {
     super(...args);
 
     this.state = {};
   }
 
-  render(){
+  render() {
     return (
       <div>
         <Button onClick={ ()=> this.setState({ open: !this.state.open })}>
diff --git a/docs/examples/DropdownButtonBasic.js b/docs/examples/DropdownButtonBasic.js
index 5472266b15..9f9ddf3d38 100644
--- a/docs/examples/DropdownButtonBasic.js
+++ b/docs/examples/DropdownButtonBasic.js
@@ -1,6 +1,6 @@
 const BUTTONS = ['Default', 'Primary', 'Success', 'Info', 'Warning', 'Danger', 'Link'];
 
-function renderDropdownButton (title, i) {
+function renderDropdownButton(title, i) {
   return (
     <DropdownButton bsStyle={title.toLowerCase()} title={title} key={i} id={`dropdown-basic-${i}`}>
       <MenuItem eventKey="1">Action</MenuItem>
diff --git a/docs/examples/DropdownButtonCustomMenu.js b/docs/examples/DropdownButtonCustomMenu.js
index a529a8e6ac..429583d8a9 100644
--- a/docs/examples/DropdownButtonCustomMenu.js
+++ b/docs/examples/DropdownButtonCustomMenu.js
@@ -1,13 +1,13 @@
 
 class CustomMenu extends React.Component {
 
-  constructor(...args){
+  constructor(...args) {
     super(...args);
     this.state = { value: '' };
     this.onChange = e => this.setState({ value: e.target.value });
   }
 
-  render(){
+  render() {
     let { className, ...props } = this.props;
 
     return (
@@ -30,7 +30,7 @@ class CustomMenu extends React.Component {
     );
   }
 
-  filterChildren(){
+  filterChildren() {
     let { children } = this.props;
     let { value } = this.state;
     let filtered = [];
diff --git a/docs/examples/Fade.js b/docs/examples/Fade.js
index 2f834dfc08..c0076bd49e 100644
--- a/docs/examples/Fade.js
+++ b/docs/examples/Fade.js
@@ -1,12 +1,12 @@
 
 class Example extends React.Component {
 
-  constructor(...args){
+  constructor(...args) {
     super(...args);
     this.state = {};
   }
 
-  render(){
+  render() {
     return (
       <div>
         <Button onClick={()=> this.setState({ open: !this.state.open })}>
diff --git a/docs/examples/ListGroupLinked.js b/docs/examples/ListGroupLinked.js
index 5a9023c05f..1b680e8bc5 100644
--- a/docs/examples/ListGroupLinked.js
+++ b/docs/examples/ListGroupLinked.js
@@ -1,4 +1,4 @@
-function alertClicked () {
+function alertClicked() {
   alert('You clicked the third ListGroupItem');
 }
 
diff --git a/docs/examples/MenuItem.js b/docs/examples/MenuItem.js
index d260491036..9a4d6dfa98 100644
--- a/docs/examples/MenuItem.js
+++ b/docs/examples/MenuItem.js
@@ -1,4 +1,4 @@
-function onSelectAlert(eventKey, href, target) {
+function onSelectAlert(eventKey, href) {
   alert('Alert from menu item.\neventKey: "' + eventKey + '"\nhref: "' + href + '"');
 }
 
diff --git a/docs/examples/Modal.js b/docs/examples/Modal.js
index 3fdd35b097..bf23d63369 100644
--- a/docs/examples/Modal.js
+++ b/docs/examples/Modal.js
@@ -1,14 +1,14 @@
 const Example = React.createClass({
 
-  getInitialState(){
+  getInitialState() {
     return { showModal: false };
   },
 
-  close(){
+  close() {
     this.setState({ showModal: false });
   },
 
-  open(){
+  open() {
     this.setState({ showModal: true });
   },
 
diff --git a/docs/examples/ModalContained.js b/docs/examples/ModalContained.js
index 88e8f79e82..0b00a03c58 100644
--- a/docs/examples/ModalContained.js
+++ b/docs/examples/ModalContained.js
@@ -10,19 +10,19 @@
  */
 
 const Trigger = React.createClass({
-  getInitialState(){
+  getInitialState() {
     return { show: false };
   },
 
   render() {
-    let close = e => this.setState({ show: false});
+    let close = () => this.setState({ show: false});
 
     return (
       <div className="modal-container" style={{height: 200}}>
         <Button
           bsStyle="primary"
           bsSize="large"
-          onClick={e => this.setState({ show: true})}
+          onClick={() => this.setState({ show: true})}
         >
           Launch contained modal
         </Button>
diff --git a/docs/examples/ModalDefaultSizing.js b/docs/examples/ModalDefaultSizing.js
index 7f1435757d..fdd51beb6a 100644
--- a/docs/examples/ModalDefaultSizing.js
+++ b/docs/examples/ModalDefaultSizing.js
@@ -53,12 +53,12 @@ const MyLargeModal = React.createClass({
 });
 
 const App = React.createClass({
-  getInitialState(){
+  getInitialState() {
     return { smShow: false, lgShow: false };
   },
-  render(){
-    let smClose = e => this.setState({ smShow: false });
-    let lgClose = e => this.setState({ lgShow: false });
+  render() {
+    let smClose = () => this.setState({ smShow: false });
+    let lgClose = () => this.setState({ lgShow: false });
 
     return (
       <ButtonToolbar>
diff --git a/docs/examples/NavBasic.js b/docs/examples/NavBasic.js
index 075fe4f934..068618d2f8 100644
--- a/docs/examples/NavBasic.js
+++ b/docs/examples/NavBasic.js
@@ -1,4 +1,4 @@
-function handleSelect (selectedKey) {
+function handleSelect(selectedKey) {
   alert('selected ' + selectedKey);
 }
 
diff --git a/docs/examples/NavStacked.js b/docs/examples/NavStacked.js
index 8680f9384b..65e3a75d16 100644
--- a/docs/examples/NavStacked.js
+++ b/docs/examples/NavStacked.js
@@ -1,4 +1,4 @@
-function handleSelect (selectedKey) {
+function handleSelect(selectedKey) {
   alert('selected ' + selectedKey);
 }
 
diff --git a/docs/examples/Overlay.js b/docs/examples/Overlay.js
index 7a98967772..2ddb066285 100644
--- a/docs/examples/Overlay.js
+++ b/docs/examples/Overlay.js
@@ -1,20 +1,20 @@
 
 const Example = React.createClass({
-  getInitialState(){
+  getInitialState() {
     return { show: true };
   },
 
-  toggle(){
+  toggle() {
     this.setState({ show: !this.state.show });
   },
 
-  render(){
+  render() {
     const tooltip = <Tooltip>Tooltip overload!</Tooltip>;
 
     const sharedProps = {
       show: this.state.show,
       container: this,
-      target: props => React.findDOMNode(this.refs.target)
+      target: () => React.findDOMNode(this.refs.target)
     };
 
     return (
diff --git a/docs/examples/OverlayCustom.js b/docs/examples/OverlayCustom.js
index c5c002e089..e2336e5183 100644
--- a/docs/examples/OverlayCustom.js
+++ b/docs/examples/OverlayCustom.js
@@ -1,14 +1,14 @@
 
 const Example = React.createClass({
-  getInitialState(){
+  getInitialState() {
     return { show: true };
   },
 
-  toggle(){
+  toggle() {
     this.setState({ show: !this.state.show });
   },
 
-  render(){
+  render() {
     const style = {
       position: 'absolute',
       backgroundColor: '#EEE',
@@ -31,7 +31,7 @@ const Example = React.createClass({
           onHide={() => this.setState({ show: false })}
           placement="right"
           container={this}
-          target={ props => React.findDOMNode(this.refs.target)}
+          target={() => React.findDOMNode(this.refs.target)}
         >
           <div style={style}>
             <strong>Holy guacamole!</strong> Check this info.
diff --git a/docs/examples/PaginationBasic.js b/docs/examples/PaginationBasic.js
index fb161ff104..a90124998c 100644
--- a/docs/examples/PaginationBasic.js
+++ b/docs/examples/PaginationBasic.js
@@ -5,7 +5,7 @@ const PaginationBasic = React.createClass({
     };
   },
 
-  handleSelect(event, selectedEvent){
+  handleSelect(event, selectedEvent) {
     this.setState({
       activePage: selectedEvent.eventKey
     });
diff --git a/docs/examples/PanelCollapsible.js b/docs/examples/PanelCollapsible.js
index 51d41a1fee..07f1f43dc0 100644
--- a/docs/examples/PanelCollapsible.js
+++ b/docs/examples/PanelCollapsible.js
@@ -1,12 +1,12 @@
 class Example extends React.Component {
-  constructor(...args){
+  constructor(...args) {
     super(...args);
     this.state = {
       open: true
     };
   }
 
-  render(){
+  render() {
     return (
       <div>
         <Button onClick={ ()=> this.setState({ open: !this.state.open })}>
diff --git a/docs/examples/PopoverContained.js b/docs/examples/PopoverContained.js
index ae7f295913..a5fc30f435 100644
--- a/docs/examples/PopoverContained.js
+++ b/docs/examples/PopoverContained.js
@@ -1,9 +1,9 @@
 class Example extends React.Component {
-  constructor(...args){
+  constructor(...args) {
     super(...args);
     this.state = { show: false };
   }
-  render(){
+  render() {
     return (
       <ButtonToolbar>
         <Button
diff --git a/docs/examples/SplitButtonBasic.js b/docs/examples/SplitButtonBasic.js
index aadc4736f7..e887b5a3a8 100644
--- a/docs/examples/SplitButtonBasic.js
+++ b/docs/examples/SplitButtonBasic.js
@@ -1,6 +1,6 @@
 const BUTTONS = ['Default', 'Primary', 'Success', 'Info', 'Warning', 'Danger'];
 
-function renderDropdownButton (title, i) {
+function renderDropdownButton(title, i) {
   return (
     <SplitButton bsStyle={title.toLowerCase()} title={title} key={i} id={`split-button-basic-${i}`}>
       <MenuItem eventKey="1">Action</MenuItem>
diff --git a/docs/generate-metadata.js b/docs/generate-metadata.js
index 7a9667fffe..4341b94d58 100644
--- a/docs/generate-metadata.js
+++ b/docs/generate-metadata.js
@@ -26,7 +26,7 @@ let isLiteral = str => (/^('|")/).test(str.trim());
  *
  * @param  {ComponentMetadata|PropMetadata} obj
  */
-function parseDoclets(obj){
+function parseDoclets(obj) {
   obj.doclets = metadata.parseDoclets(obj.desc || '') || {};
   obj.desc = cleanDoclets(obj.desc || '');
   obj.descHtml = marked(obj.desc || '');
@@ -39,7 +39,7 @@ function parseDoclets(obj){
  * @param  {Object} props     Object Hash of the prop metadata
  * @param  {String} propName
  */
-function applyPropDoclets(props, propName){
+function applyPropDoclets(props, propName) {
   let prop = props[propName];
   let doclets = prop.doclets;
   let value;
@@ -72,8 +72,8 @@ function applyPropDoclets(props, propName){
 }
 
 
-export default function generate(destination, options = { mixins: true, inferComponent: true }){
-  return globp(__dirname + '/../src/**/*.js') //eslint-disable-line no-path-concat
+export default function generate(destination, options = { mixins: true, inferComponent: true }) {
+  return globp(__dirname + '/../src/**/*.js') // eslint-disable-line no-path-concat
     .then( files => {
       let results = files.map(
         filename => fsp.readFile(filename).then(content => metadata(content, options)) );
@@ -96,7 +96,7 @@ export default function generate(destination, options = { mixins: true, inferCom
               });
             });
 
-            //combine all the component metadata into one large object
+            // combine all the component metadata into one large object
             result = { ...result, ...components };
           });
 
diff --git a/docs/server.js b/docs/server.js
index 9581cf4d4a..ffb36094d3 100644
--- a/docs/server.js
+++ b/docs/server.js
@@ -21,7 +21,7 @@ if (development) {
   let webpackPort = process.env.WEBPACK_DEV_PORT;
   let target = `http://${ip.address()}:${webpackPort}`;
 
-  app.get('/assets/*', function (req, res) {
+  app.get('/assets/*', function(req, res) {
     proxy.web(req, res, { target });
   });
 
@@ -49,7 +49,7 @@ if (development) {
   app.use(express.static(path.join(__dirname, '../docs-built')));
 }
 
-app.listen(port, function () {
+app.listen(port, function() {
   console.log(`Server started at:`);
   console.log(`- http://localhost:${port}`);
   console.log(`- http://${ip.address()}:${port}`);
diff --git a/docs/src/HomePage.js b/docs/src/HomePage.js
index 30bf0a3804..55fde2677f 100644
--- a/docs/src/HomePage.js
+++ b/docs/src/HomePage.js
@@ -7,7 +7,7 @@ import Alert from '../../src/Alert';
 import Glyphicon from '../../src/Glyphicon';
 import Label from '../../src/Label';
 
-export default class HomePage extends React.Component{
+export default class HomePage extends React.Component {
   render() {
     return (
       <div>
diff --git a/docs/src/PropTable.js b/docs/src/PropTable.js
index 023f87f7ad..0a22d76226 100644
--- a/docs/src/PropTable.js
+++ b/docs/src/PropTable.js
@@ -8,7 +8,7 @@ import Table from '../../src/Table';
 let cleanDocletValue = str => str.trim().replace(/^\{/, '').replace(/\}$/, '');
 let capitalize = str => str[0].toUpperCase() + str.substr(1);
 
-function getPropsData(component, metadata){
+function getPropsData(component, metadata) {
   let componentData = metadata[component] || {};
   let props = componentData.props || {};
 
@@ -38,14 +38,14 @@ const PropTable = React.createClass({
     metadata: React.PropTypes.object
   },
 
-  componentWillMount(){
+  componentWillMount() {
     this.propsData = getPropsData(this.props.component, this.context.metadata);
   },
 
-  render(){
+  render() {
     let propsData = this.propsData;
 
-    if ( !Object.keys(propsData).length){
+    if ( !Object.keys(propsData).length) {
       return <span/>;
     }
 
@@ -66,7 +66,7 @@ const PropTable = React.createClass({
     );
   },
 
-  _renderRows(propsData){
+  _renderRows(propsData) {
     return Object.keys(propsData)
       .sort()
       .filter(propName => propsData[propName].type && !propsData[propName].doclets.private )
@@ -107,7 +107,7 @@ const PropTable = React.createClass({
     );
   },
 
-  renderControllableNote(prop, propName){
+  renderControllableNote(prop, propName) {
     let controllable = prop.doclets.controllable;
     let isHandler = this.getDisplayTypeName(prop.type.name) === 'function';
 
diff --git a/docs/src/Root.js b/docs/src/Root.js
index 449db4528e..668a7ce4c2 100644
--- a/docs/src/Root.js
+++ b/docs/src/Root.js
@@ -30,7 +30,7 @@ const Root = React.createClass({
     metadata: React.PropTypes.object
   },
 
-  getChildContext(){
+  getChildContext() {
     return { metadata: this.props.propData };
   },
 
diff --git a/karma.conf.js b/karma.conf.js
index da4f415448..26e3954034 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,4 +1,4 @@
-/* eslint no-var: 0, babel/object-shorthand: 0 */
+/* eslint no-var: 0, babel/object-shorthand: 0, vars-on-top: 0 */
 require('babel/register');
 
 var webpackConfig = require('./webpack/test.config.js');
@@ -18,7 +18,7 @@ if (runCoverage) {
   }
 }
 
-module.exports = function (config) {
+module.exports = function(config) {
   config.set({
 
     basePath: '',
diff --git a/src/ButtonGroup.js b/src/ButtonGroup.js
index 303a61eadb..e5f42d0d71 100644
--- a/src/ButtonGroup.js
+++ b/src/ButtonGroup.js
@@ -15,7 +15,7 @@ const ButtonGroup = React.createClass({
      */
     block: CustomPropTypes.all([
       React.PropTypes.bool,
-      function(props, propName, componentName) {
+      function(props) {
         if (props.block && !props.vertical) {
           return new Error('The block property requires the vertical property to be set to have any effect');
         }
diff --git a/src/ButtonInput.js b/src/ButtonInput.js
index 5828d427d4..c323c83bab 100644
--- a/src/ButtonInput.js
+++ b/src/ButtonInput.js
@@ -25,8 +25,8 @@ ButtonInput.defaultProps = {
 
 ButtonInput.propTypes = {
   type: React.PropTypes.oneOf(ButtonInput.types),
-  bsStyle(props) {
-    //defer to Button propTypes of bsStyle
+  bsStyle() {
+    // defer to Button propTypes of bsStyle
     return null;
   },
   children: childrenValueValidation,
diff --git a/src/Col.js b/src/Col.js
index f945fe10b5..4b91f2af1a 100644
--- a/src/Col.js
+++ b/src/Col.js
@@ -149,7 +149,7 @@ const Col = React.createClass({
     let ComponentClass = this.props.componentClass;
     let classes = {};
 
-    Object.keys(styleMaps.SIZES).forEach(function (key) {
+    Object.keys(styleMaps.SIZES).forEach(function(key) {
       let size = styleMaps.SIZES[key];
       let prop = size;
       let classPart = size + '-';
diff --git a/src/Collapse.js b/src/Collapse.js
index 6de6709e6c..716c8e214e 100644
--- a/src/Collapse.js
+++ b/src/Collapse.js
@@ -16,7 +16,7 @@ const MARGINS = {
   width:  ['marginLeft', 'marginRight']
 };
 
-function getDimensionValue(dimension, elem){
+function getDimensionValue(dimension, elem) {
   let value = elem[`offset${capitalize(dimension)}`];
   let margins = MARGINS[dimension];
 
@@ -28,7 +28,7 @@ function getDimensionValue(dimension, elem){
 
 class Collapse extends React.Component {
 
-  constructor(props, context){
+  constructor(props, context) {
     super(props, context);
 
     this.onEnterListener = this.handleEnter.bind(this);
@@ -68,48 +68,48 @@ class Collapse extends React.Component {
   }
 
   /* -- Expanding -- */
-  handleEnter(elem){
+  handleEnter(elem) {
     let dimension = this._dimension();
     elem.style[dimension] = '0';
   }
 
-  handleEntering(elem){
+  handleEntering(elem) {
     let dimension = this._dimension();
 
     elem.style[dimension] = this._getScrollDimensionValue(elem, dimension);
   }
 
-  handleEntered(elem){
+  handleEntered(elem) {
     let dimension = this._dimension();
     elem.style[dimension] = null;
   }
 
   /* -- Collapsing -- */
-  handleExit(elem){
+  handleExit(elem) {
     let dimension = this._dimension();
 
     elem.style[dimension] = this.props.getDimensionValue(dimension, elem) + 'px';
   }
 
-  handleExiting(elem){
+  handleExiting(elem) {
     let dimension = this._dimension();
 
     triggerBrowserReflow(elem);
     elem.style[dimension] = '0';
   }
 
-  _dimension(){
+  _dimension() {
     return typeof this.props.dimension === 'function'
       ? this.props.dimension()
       : this.props.dimension;
   }
 
-  //for testing
-  _getTransitionInstance(){
+  // for testing
+  _getTransitionInstance() {
     return this.refs.transition;
   }
 
-  _getScrollDimensionValue(elem, dimension){
+  _getScrollDimensionValue(elem, dimension) {
     return elem[`scroll${capitalize(dimension)}`] + 'px';
   }
 }
@@ -148,7 +148,7 @@ Collapse.propTypes = {
   duration: CustomPropTypes.all([
     React.PropTypes.number,
     (props)=> {
-      if (props.duration != null){
+      if (props.duration != null) {
         deprecationWarning('Collapse `duration`', 'the `timeout` prop');
       }
       return null;
diff --git a/src/CollapsibleMixin.js b/src/CollapsibleMixin.js
index 2a15968e4a..77b379d83f 100644
--- a/src/CollapsibleMixin.js
+++ b/src/CollapsibleMixin.js
@@ -9,7 +9,7 @@ const CollapsibleMixin = {
     expanded: React.PropTypes.bool
   },
 
-  getInitialState(){
+  getInitialState() {
     const defaultExpanded = this.props.defaultExpanded != null ?
       this.props.defaultExpanded : !!this.props.expanded;
 
@@ -19,11 +19,11 @@ const CollapsibleMixin = {
     };
   },
 
-  componentWillMount(){
+  componentWillMount() {
     deprecationWarning('CollapsibleMixin', 'Collapse Component');
   },
 
-  componentWillUpdate(nextProps, nextState){
+  componentWillUpdate(nextProps, nextState) {
     let willExpanded = nextProps.expanded != null ? nextProps.expanded : nextState.expanded;
     if (willExpanded === this.isExpanded()) {
       return;
@@ -38,7 +38,7 @@ const CollapsibleMixin = {
     let dimension = this.dimension();
     let value = '0';
 
-    if(!willExpanded){
+    if (!willExpanded) {
       value = this.getCollapsibleDimensionValue();
     }
 
@@ -47,7 +47,7 @@ const CollapsibleMixin = {
     this._afterWillUpdate();
   },
 
-  componentDidUpdate(prevProps, prevState){
+  componentDidUpdate(prevProps, prevState) {
     // check if expanded is being toggled; if so, set collapsing
     this._checkToggleCollapsing(prevProps, prevState);
 
@@ -56,11 +56,11 @@ const CollapsibleMixin = {
   },
 
   // helps enable test stubs
-  _afterWillUpdate(){
+  _afterWillUpdate() {
   },
 
-  _checkStartAnimation(){
-    if(!this.state.collapsing) {
+  _checkStartAnimation() {
+    if (!this.state.collapsing) {
       return;
     }
 
@@ -70,7 +70,7 @@ const CollapsibleMixin = {
 
     // setting the dimension here starts the transition animation
     let result;
-    if(this.isExpanded()) {
+    if (this.isExpanded()) {
       result = value + 'px';
     } else {
       result = '0px';
@@ -78,11 +78,11 @@ const CollapsibleMixin = {
     node.style[dimension] = result;
   },
 
-  _checkToggleCollapsing(prevProps, prevState){
+  _checkToggleCollapsing(prevProps, prevState) {
     let wasExpanded = prevProps.expanded != null ? prevProps.expanded : prevState.expanded;
     let isExpanded = this.isExpanded();
-    if(wasExpanded !== isExpanded){
-      if(wasExpanded) {
+    if (wasExpanded !== isExpanded) {
+      if (wasExpanded) {
         this._handleCollapse();
       } else {
         this._handleExpand();
@@ -90,7 +90,7 @@ const CollapsibleMixin = {
     }
   },
 
-  _handleExpand(){
+  _handleExpand() {
     let node = this.getCollapsibleDOMNode();
     let dimension = this.dimension();
 
@@ -111,7 +111,7 @@ const CollapsibleMixin = {
     });
   },
 
-  _handleCollapse(){
+  _handleCollapse() {
     let node = this.getCollapsibleDOMNode();
 
     let complete = () => {
@@ -129,22 +129,22 @@ const CollapsibleMixin = {
   },
 
   // helps enable test stubs
-  _addEndEventListener(node, complete){
+  _addEndEventListener(node, complete) {
     TransitionEvents.addEndEventListener(node, complete);
   },
 
   // helps enable test stubs
-  _removeEndEventListener(node, complete){
+  _removeEndEventListener(node, complete) {
     TransitionEvents.removeEndEventListener(node, complete);
   },
 
-  dimension(){
+  dimension() {
     return (typeof this.getCollapsibleDimension === 'function') ?
       this.getCollapsibleDimension() :
       'height';
   },
 
-  isExpanded(){
+  isExpanded() {
     return this.props.expanded != null ? this.props.expanded : this.state.expanded;
   },
 
diff --git a/src/CollapsibleNav.js b/src/CollapsibleNav.js
index 2164e92b75..a607fdcb6e 100644
--- a/src/CollapsibleNav.js
+++ b/src/CollapsibleNav.js
@@ -38,7 +38,7 @@ const CollapsibleNav = React.createClass({
       </div>
     );
 
-    if ( this.props.collapsible ){
+    if ( this.props.collapsible ) {
       return (
         <Collapse in={this.props.expanded}>
           { nav }
diff --git a/src/Dropdown.js b/src/Dropdown.js
index b017f064c7..57d35a9dd0 100644
--- a/src/Dropdown.js
+++ b/src/Dropdown.js
@@ -113,7 +113,7 @@ class Dropdown extends React.Component {
     }
   }
 
-  handleClick(event) {
+  handleClick() {
     if (this.props.disabled) {
       return;
     }
@@ -128,7 +128,7 @@ class Dropdown extends React.Component {
       }
     };
 
-    switch(event.keyCode) {
+    switch (event.keyCode) {
     case keycode.codes.down:
       if (!this.props.open) {
         this.toggleOpen();
@@ -145,7 +145,7 @@ class Dropdown extends React.Component {
     }
   }
 
-  handleClose(event) {
+  handleClose() {
     if (!this.props.open) {
       return;
     }
@@ -153,7 +153,7 @@ class Dropdown extends React.Component {
     this.toggleOpen();
   }
 
-  focus(){
+  focus() {
     let toggle = React.findDOMNode(this.refs[TOGGLE_REF]);
 
     if (toggle && toggle.focus) {
@@ -169,7 +169,7 @@ class Dropdown extends React.Component {
       let extractor = find(this.childExtractors, x => x.matches(child));
 
       if (extractor) {
-        if (seen[extractor.key]){
+        if (seen[extractor.key]) {
           return false;
         }
 
@@ -289,7 +289,7 @@ Dropdown.propTypes = {
    * `open` value.
    *
    * ```js
-   * function(Boolean isOpen){}
+   * function(Boolean isOpen) {}
    * ```
    * @controllable open
    */
diff --git a/src/DropdownButton.js b/src/DropdownButton.js
index 0bd169e2c7..95c6bf685d 100644
--- a/src/DropdownButton.js
+++ b/src/DropdownButton.js
@@ -17,7 +17,7 @@ class DropdownButton extends React.Component {
 
     let toggleProps = omit(props, Dropdown.ControlledComponent.propTypes);
 
-    if (navItem){
+    if (navItem) {
       return <NavDropdown {...this.props}/>;
     }
 
@@ -48,7 +48,7 @@ DropdownButton.propTypes = {
    */
   navItem: CustomPropTypes.all([
     React.PropTypes.bool,
-    function(props, propName, componentName) {
+    function(props) {
       if (props.navItem) {
         deprecationWarning('navItem', 'NavDropdown component', 'https://github.com/react-bootstrap/react-bootstrap/issues/526');
       }
diff --git a/src/DropdownMenu.js b/src/DropdownMenu.js
index 3a0773425c..17ec1d8e89 100644
--- a/src/DropdownMenu.js
+++ b/src/DropdownMenu.js
@@ -18,7 +18,7 @@ class DropdownMenu extends React.Component {
   }
 
   handleKeyDown(event) {
-    switch(event.keyCode) {
+    switch (event.keyCode) {
     case keycode.codes.down:
       this.focusNext();
       event.preventDefault();
diff --git a/src/Fade.js b/src/Fade.js
index ab73876461..508ddcb42c 100644
--- a/src/Fade.js
+++ b/src/Fade.js
@@ -54,7 +54,7 @@ Fade.propTypes = {
   duration: CustomPropTypes.all([
     React.PropTypes.number,
     (props)=> {
-      if (props.duration != null){
+      if (props.duration != null) {
         deprecationWarning('Fade `duration`', 'the `timeout` prop');
       }
       return null;
diff --git a/src/FadeMixin.js b/src/FadeMixin.js
index c96e024a3a..35170c9375 100644
--- a/src/FadeMixin.js
+++ b/src/FadeMixin.js
@@ -3,13 +3,13 @@ import domUtils from './utils/domUtils';
 import deprecationWarning from './utils/deprecationWarning';
 
 // TODO: listen for onTransitionEnd to remove el
-function getElementsAndSelf (root, classes){
+function getElementsAndSelf(root, classes) {
   let els = root.querySelectorAll('.' + classes.join('.'));
 
-  els = [].map.call(els, function(e){ return e; });
+  els = [].map.call(els, function(e) { return e; });
 
-  for(let i = 0; i < classes.length; i++){
-    if( !root.className.match(new RegExp('\\b' + classes[i] + '\\b'))){
+  for (let i = 0; i < classes.length; i++) {
+    if ( !root.className.match(new RegExp('\\b' + classes[i] + '\\b'))) {
       return els;
     }
   }
@@ -18,7 +18,7 @@ function getElementsAndSelf (root, classes){
 }
 
 export default {
-  componentWillMount(){
+  componentWillMount() {
     deprecationWarning('FadeMixin', 'Fade Component');
   },
 
@@ -29,7 +29,7 @@ export default {
       els = getElementsAndSelf(React.findDOMNode(this), ['fade']);
 
       if (els.length) {
-        els.forEach(function (el) {
+        els.forEach(function(el) {
           el.className += ' in';
         });
       }
@@ -40,7 +40,7 @@ export default {
     let els = getElementsAndSelf(this._fadeOutEl, ['fade', 'in']);
 
     if (els.length) {
-      els.forEach(function (el) {
+      els.forEach(function(el) {
         el.className = el.className.replace(/\bin\b/, '');
       });
     }
diff --git a/src/FormGroup.js b/src/FormGroup.js
index bf11d8b8a7..29ac5028f7 100644
--- a/src/FormGroup.js
+++ b/src/FormGroup.js
@@ -29,7 +29,7 @@ FormGroup.defaultProps = {
 FormGroup.propTypes = {
   standalone: React.PropTypes.bool,
   hasFeedback: React.PropTypes.bool,
-  bsSize (props) {
+  bsSize(props) {
     if (props.standalone && props.bsSize !== undefined) {
       return new Error('bsSize will not be used when `standalone` is set.');
     }
diff --git a/src/ListGroup.js b/src/ListGroup.js
index bb3f931f34..3400545c0f 100644
--- a/src/ListGroup.js
+++ b/src/ListGroup.js
@@ -21,20 +21,20 @@ class ListGroup extends React.Component {
       });
     }
 
-    if (shouldRenderDiv){
+    if (shouldRenderDiv) {
       return this.renderDiv(items);
     } else {
       return this.renderUL(items);
     }
   }
 
-  isAnchorOrButton(props){
+  isAnchorOrButton(props) {
     return (props.href || props.onClick);
   }
 
   renderUL(items) {
     let listItems = ValidComponentChildren.map(items,
-      (item, index) => cloneElement(item, { listItem: true })
+      (item) => cloneElement(item, { listItem: true })
     );
 
     return (
diff --git a/src/MenuItem.js b/src/MenuItem.js
index 3997443106..d6f67fc8d6 100644
--- a/src/MenuItem.js
+++ b/src/MenuItem.js
@@ -66,7 +66,7 @@ MenuItem.propTypes = {
   active: React.PropTypes.bool,
   divider: CustomPropTypes.all([
     React.PropTypes.bool,
-    function(props, propName, componentName) {
+    function(props) {
       if (props.divider && props.children) {
         return new Error('Children will not be rendered for dividers');
       }
diff --git a/src/Modal.js b/src/Modal.js
index 2df48db2d4..4327687d22 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -1,4 +1,4 @@
-/*eslint-disable react/prop-types */
+/* eslint-disable react/prop-types */
 import React, { cloneElement } from 'react';
 import classNames from 'classnames';
 import domUtils from './utils/domUtils';
@@ -242,7 +242,7 @@ const Modal = React.createClass({
 
     this.refs.dialog = ref;
 
-    //maintains backwards compat with older component breakdown
+    // maintains backwards compat with older component breakdown
     if (!this.props.backdrop) {
       this.refs.modal = ref;
     }
@@ -273,7 +273,7 @@ const Modal = React.createClass({
     let { animation } = this.props;
 
     if (prevProps.show && !this.props.show && !animation) {
-      //otherwise handleHidden will call this.
+      // otherwise handleHidden will call this.
       this.onHide();
     } else if (!prevProps.show && this.props.show) {
       this.onShow();
@@ -406,8 +406,8 @@ const Modal = React.createClass({
     // IOS only allows click events to be delegated to the document on elements
     // it considers 'clickable' - anchors, buttons, etc. We fake a click handler on the
     // DOM nodes themselves. Remove if handled by React: https://github.com/facebook/react/issues/1169
-    React.findDOMNode(this.refs.modal).onclick = function () {};
-    React.findDOMNode(this.refs.backdrop).onclick = function () {};
+    React.findDOMNode(this.refs.modal).onclick = function() {};
+    React.findDOMNode(this.refs.backdrop).onclick = function() {};
   },
 
   _getStyles() {
diff --git a/src/ModalDialog.js b/src/ModalDialog.js
index 31768d5316..54929a4870 100644
--- a/src/ModalDialog.js
+++ b/src/ModalDialog.js
@@ -1,4 +1,4 @@
-/*eslint-disable react/prop-types */
+/* eslint-disable react/prop-types */
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
diff --git a/src/ModalHeader.js b/src/ModalHeader.js
index 9aa287f4be..14475382fa 100644
--- a/src/ModalHeader.js
+++ b/src/ModalHeader.js
@@ -22,7 +22,7 @@ class ModalHeader extends React.Component {
   }
 }
 
-//used in liue of parent contexts right now to auto wire the close button
+// used in liue of parent contexts right now to auto wire the close button
 ModalHeader.__isModalHeader = true;
 
 ModalHeader.propTypes = {
diff --git a/src/OverlayTrigger.js b/src/OverlayTrigger.js
index d42b521583..43eed2e765 100644
--- a/src/OverlayTrigger.js
+++ b/src/OverlayTrigger.js
@@ -1,4 +1,4 @@
-/*eslint-disable react/prop-types */
+/* eslint-disable react/prop-types */
 import React, { cloneElement } from 'react';
 import contains from 'dom-helpers/query/contains';
 import createChainedFunction from './utils/createChainedFunction';
@@ -78,19 +78,19 @@ const OverlayTrigger = React.createClass({
      */
     onMouseLeave: React.PropTypes.func,
 
-    //override specific overlay props
+    // override specific overlay props
     /**
      * @private
      */
-    target(){},
+    target() {},
      /**
      * @private
      */
-    onHide(){},
+    onHide() {},
     /**
      * @private
      */
-    show(){}
+    show() {}
   },
 
   getDefaultProps() {
@@ -131,7 +131,7 @@ const OverlayTrigger = React.createClass({
     this.handleMouseOut = this.handleMouseOverOut.bind(null, this.handleDelayedHide);
   },
 
-  componentDidMount(){
+  componentDidMount() {
     this._mountNode = document.createElement('div');
     React.render(this._overlay, this._mountNode);
   },
@@ -142,7 +142,7 @@ const OverlayTrigger = React.createClass({
     clearTimeout(this._hoverDelay);
   },
 
-  componentDidUpdate(){
+  componentDidUpdate() {
     if (this._mountNode) {
       React.render(this._overlay, this._mountNode);
     }
@@ -261,11 +261,11 @@ const OverlayTrigger = React.createClass({
   // React's built version is broken: https://github.com/facebook/react/issues/4251
   // for cases when the trigger is disabled and mouseOut/Over can cause flicker moving
   // from one child element to another.
-  handleMouseOverOut(handler, e){
+  handleMouseOverOut(handler, e) {
     let target = e.currentTarget;
     let related = e.relatedTarget || e.nativeEvent.toElement;
 
-    if (!related || related !== target && !contains(target, related)){
+    if (!related || related !== target && !contains(target, related)) {
       handler(e);
     }
   }
diff --git a/src/Pagination.js b/src/Pagination.js
index 5c95e3b522..8157914115 100644
--- a/src/Pagination.js
+++ b/src/Pagination.js
@@ -51,15 +51,15 @@ const Pagination = React.createClass({
       buttonComponentClass
     } = this.props;
 
-    if(maxButtons){
+    if (maxButtons) {
       let hiddenPagesBefore = activePage - parseInt(maxButtons / 2, 10);
       startPage = hiddenPagesBefore > 1 ? hiddenPagesBefore : 1;
       hasHiddenPagesAfter = startPage + maxButtons <= items;
 
-      if(!hasHiddenPagesAfter){
+      if (!hasHiddenPagesAfter) {
         endPage = items;
         startPage = items - maxButtons + 1;
-        if(startPage < 1){
+        if (startPage < 1) {
           startPage = 1;
         }
       } else {
@@ -70,7 +70,7 @@ const Pagination = React.createClass({
       endPage = items;
     }
 
-    for(let pagenumber = startPage; pagenumber <= endPage; pagenumber++){
+    for (let pagenumber = startPage; pagenumber <= endPage; pagenumber++) {
       pageButtons.push(
         <PaginationButton
           key={pagenumber}
@@ -83,7 +83,7 @@ const Pagination = React.createClass({
       );
     }
 
-    if(maxButtons && hasHiddenPagesAfter && ellipsis){
+    if (maxButtons && hasHiddenPagesAfter && ellipsis) {
       pageButtons.push(
         <PaginationButton
           key="ellipsis"
@@ -98,7 +98,7 @@ const Pagination = React.createClass({
   },
 
   renderPrev() {
-    if(!this.props.prev){
+    if (!this.props.prev) {
       return null;
     }
 
@@ -115,7 +115,7 @@ const Pagination = React.createClass({
   },
 
   renderNext() {
-    if(!this.props.next){
+    if (!this.props.next) {
       return null;
     }
 
@@ -132,7 +132,7 @@ const Pagination = React.createClass({
   },
 
   renderFirst() {
-    if(!this.props.first){
+    if (!this.props.first) {
       return null;
     }
 
@@ -149,7 +149,7 @@ const Pagination = React.createClass({
   },
 
   renderLast() {
-    if(!this.props.last){
+    if (!this.props.last) {
       return null;
     }
 
diff --git a/src/Panel.js b/src/Panel.js
index f4ec4a9c2e..69ec376851 100644
--- a/src/Panel.js
+++ b/src/Panel.js
@@ -31,13 +31,13 @@ const Panel = React.createClass({
     };
   },
 
-  getInitialState(){
+  getInitialState() {
     return {
       expanded: this.props.defaultExpanded
     };
   },
 
-  handleSelect(e){
+  handleSelect(e) {
     e.selected = true;
 
     if (this.props.onSelect) {
@@ -51,11 +51,11 @@ const Panel = React.createClass({
     }
   },
 
-  handleToggle(){
+  handleToggle() {
     this.setState({ expanded: !this.state.expanded});
   },
 
-  isExpanded(){
+  isExpanded() {
     return this.props.expanded != null ? this.props.expanded : this.state.expanded;
   },
 
@@ -103,11 +103,11 @@ const Panel = React.createClass({
       return {key: bodyElements.length};
     }
 
-    function addPanelChild (child) {
+    function addPanelChild(child) {
       bodyElements.push(cloneElement(child, getProps()));
     }
 
-    function addPanelBody (children) {
+    function addPanelBody(children) {
       bodyElements.push(
         <div className={bodyClass} {...getProps()}>
           {children}
@@ -115,7 +115,7 @@ const Panel = React.createClass({
       );
     }
 
-    function maybeRenderPanelBody () {
+    function maybeRenderPanelBody() {
       if (panelBodyChildren.length === 0) {
         return;
       }
diff --git a/src/SplitButton.js b/src/SplitButton.js
index 46d57a1a97..4aec5d3403 100644
--- a/src/SplitButton.js
+++ b/src/SplitButton.js
@@ -49,14 +49,13 @@ class SplitButton extends React.Component {
 }
 
 SplitButton.propTypes = {
-  //dropup: React.PropTypes.bool,
   ...Dropdown.propTypes,
   ...BootstrapMixin.propTypes,
 
   /**
    * @private
    */
-  onClick(){},
+  onClick() {},
   target: React.PropTypes.string,
   href: React.PropTypes.string,
   /**
diff --git a/src/SubNav.js b/src/SubNav.js
index ac683fa79c..4dd66c9ba6 100644
--- a/src/SubNav.js
+++ b/src/SubNav.js
@@ -62,7 +62,7 @@ const SubNav = React.createClass({
 
       ValidComponentChildren.forEach(
         child.props.children,
-        function (grandchild) {
+        function(grandchild) {
           if (this.isChildActive(grandchild)) {
             isActive = true;
           }
diff --git a/src/TabbedArea.js b/src/TabbedArea.js
index 3856b6fb35..d2201fda2d 100644
--- a/src/TabbedArea.js
+++ b/src/TabbedArea.js
@@ -15,7 +15,7 @@ const TabbedArea = React.createClass({
   render() {
     const {children, ...props} = this.props;
 
-    const tabs = ValidComponentChildren.map(children, function (child) {
+    const tabs = ValidComponentChildren.map(children, function(child) {
       const {tab: title, ...others} = child.props;
       return <TabPane title={title} {...others} />;
     });
diff --git a/src/Tabs.js b/src/Tabs.js
index ceb8126341..72345f716e 100644
--- a/src/Tabs.js
+++ b/src/Tabs.js
@@ -250,7 +250,7 @@ const Tabs = React.createClass({
     let panesColProps;
     if (paneWidth == null) {
       panesColProps = {};
-      Object.keys(tabsColProps).forEach(function (size) {
+      Object.keys(tabsColProps).forEach(function(size) {
         panesColProps[size] = styleMaps.GRID_COLUMNS - tabsColProps[size];
       });
     } else if (paneWidth instanceof Object) {
diff --git a/src/Thumbnail.js b/src/Thumbnail.js
index 6839d5c4f7..8ed7c1d561 100644
--- a/src/Thumbnail.js
+++ b/src/Thumbnail.js
@@ -21,14 +21,14 @@ const Thumbnail = React.createClass({
   render() {
     let classes = this.getBsClassSet();
 
-    if(this.props.href) {
+    if (this.props.href) {
       return (
         <SafeAnchor {...this.props} href={this.props.href} className={classSet(this.props.className, classes)}>
           <img src={this.props.src} alt={this.props.alt} />
         </SafeAnchor>
       );
     } else {
-      if(this.props.children) {
+      if (this.props.children) {
         return (
           <div {...this.props} className={classSet(this.props.className, classes)}>
             <img src={this.props.src} alt={this.props.alt} />
diff --git a/src/index.js b/src/index.js
index 461ce0a285..5f731695d9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -81,20 +81,20 @@ import createChainedFunction from './utils/createChainedFunction';
 import ValidComponentChildren from './utils/ValidComponentChildren';
 import CustomPropTypes from './utils/CustomPropTypes';
 
-function createDeprecationWrapper(obj, deprecated, instead, link){
+function createDeprecationWrapper(obj, deprecated, instead, link) {
   let wrapper = {};
 
-  if (process.env.NODE_ENV === 'production'){
+  if (process.env.NODE_ENV === 'production') {
     return obj;
   }
 
   Object.keys(obj).forEach(key => {
     Object.defineProperty(wrapper, key, {
-      get(){
+      get() {
         deprecationWarning(deprecated, instead, link);
         return obj[key];
       },
-      set(x){ obj[key] = x; }
+      set(x) { obj[key] = x; }
     });
   });
 
diff --git a/src/utils/CustomPropTypes.js b/src/utils/CustomPropTypes.js
index bdb570e98a..b501e65a1b 100644
--- a/src/utils/CustomPropTypes.js
+++ b/src/utils/CustomPropTypes.js
@@ -63,7 +63,7 @@ function createKeyOfChecker(obj) {
 }
 
 function createSinglePropFromChecker(arrOfProps) {
-  function validate(props, propName, componentName) {
+  function validate(props, propName) {
     const usedPropCount = arrOfProps
       .map(listedProp => props[listedProp])
       .reduce((acc, curr) => acc + (curr !== undefined ? 1 : 0), 0);
@@ -94,7 +94,7 @@ function all(propTypes) {
   }
 
   return function(props, propName, componentName) {
-    for(let i = 0; i < propTypes.length; i++) {
+    for (let i = 0; i < propTypes.length; i++) {
       let result = propTypes[i](props, propName, componentName);
 
       if (result !== undefined && result !== null) {
@@ -126,8 +126,8 @@ function createElementTypeChecker() {
 
 export default {
 
-  deprecated(propType, explanation){
-    return function(props, propName, componentName){
+  deprecated(propType, explanation) {
+    return function(props, propName, componentName) {
       if (props[propName] != null) {
         warning(false, `"${propName}" property of "${componentName}" has been deprecated.\n${explanation}`);
       }
@@ -136,8 +136,8 @@ export default {
     };
   },
 
-  isRequiredForA11y(propType){
-    return function(props, propName, componentName){
+  isRequiredForA11y(propType) {
+    return function(props, propName, componentName) {
       if (props[propName] == null) {
         return new Error(
           'The prop `' + propName + '` is required to make ' + componentName + ' accessible ' +
@@ -158,7 +158,7 @@ export default {
         let inRole = (role, child) => role === child.props.bsRole;
 
         roles.every(role => {
-          if (!children.some(child => inRole(role, child))){
+          if (!children.some(child => inRole(role, child))) {
             missing = role;
             return false;
           }
@@ -181,7 +181,7 @@ export default {
         roles.every(role => {
           let childrenWithRole = children.filter(child => child.props.bsRole === role);
 
-          if (childrenWithRole.length > 1){
+          if (childrenWithRole.length > 1) {
             duplicate = role;
             return false;
           }
diff --git a/src/utils/ValidComponentChildren.js b/src/utils/ValidComponentChildren.js
index fa4456fde7..1ec9384ffb 100644
--- a/src/utils/ValidComponentChildren.js
+++ b/src/utils/ValidComponentChildren.js
@@ -15,7 +15,7 @@ import React from 'react';
 function mapValidComponents(children, func, context) {
   let index = 0;
 
-  return React.Children.map(children, function (child) {
+  return React.Children.map(children, function(child) {
     if (React.isValidElement(child)) {
       let lastIndex = index;
       index++;
@@ -40,7 +40,7 @@ function mapValidComponents(children, func, context) {
 function forEachValidComponents(children, func, context) {
   let index = 0;
 
-  return React.Children.forEach(children, function (child) {
+  return React.Children.forEach(children, function(child) {
     if (React.isValidElement(child)) {
       func.call(context, child, index);
       index++;
@@ -57,7 +57,7 @@ function forEachValidComponents(children, func, context) {
 function numberOfValidComponents(children) {
   let count = 0;
 
-  React.Children.forEach(children, function (child) {
+  React.Children.forEach(children, function(child) {
     if (React.isValidElement(child)) { count++; }
   });
 
@@ -73,7 +73,7 @@ function numberOfValidComponents(children) {
 function hasValidComponent(children) {
   let hasValid = false;
 
-  React.Children.forEach(children, function (child) {
+  React.Children.forEach(children, function(child) {
     if (!hasValid && React.isValidElement(child)) {
       hasValid = true;
     }
diff --git a/src/utils/createContextWrapper.js b/src/utils/createContextWrapper.js
index 37e8a1a82e..eb8a18284d 100644
--- a/src/utils/createContextWrapper.js
+++ b/src/utils/createContextWrapper.js
@@ -4,7 +4,7 @@ import React from 'react';
  * Creates new trigger class that injects context into overlay.
  */
 export default function createContextWrapper(Trigger, propName) {
-  return function (contextTypes) {
+  return function(contextTypes) {
     class ContextWrapper extends React.Component {
       getChildContext() {
         return this.props.context;
diff --git a/src/utils/deprecationWarning.js b/src/utils/deprecationWarning.js
index 140066046d..4a779aae19 100644
--- a/src/utils/deprecationWarning.js
+++ b/src/utils/deprecationWarning.js
@@ -5,7 +5,7 @@ const warned = {};
 function deprecationWarning(oldname, newname, link) {
   let message;
 
-  if (typeof oldname === 'object'){
+  if (typeof oldname === 'object') {
     message = oldname.message;
   } else {
     message = `${oldname} is deprecated. Use ${newname} instead.`;
@@ -24,9 +24,9 @@ function deprecationWarning(oldname, newname, link) {
 }
 
 
-deprecationWarning.wrapper = function(Component, ...args){
+deprecationWarning.wrapper = function(Component, ...args) {
   return class DeprecatedComponent extends Component {
-    componentWillMount(...methodArgs){
+    componentWillMount(...methodArgs) {
       deprecationWarning(...args);
 
       if (super.componentWillMount) {
diff --git a/src/utils/domUtils.js b/src/utils/domUtils.js
index b9f99c7e49..5dc2a851af 100644
--- a/src/utils/domUtils.js
+++ b/src/utils/domUtils.js
@@ -23,7 +23,7 @@ function ownerWindow(componentOrElement) {
   return getOwnerWindow(doc);
 }
 
-//TODO remove in 0.26
+// TODO remove in 0.26
 function getComputedStyles(elem) {
   return ownerDocument(elem).defaultView.getComputedStyle(elem, null);
 }
diff --git a/test/.eslintrc b/test/.eslintrc
index cc03f68a79..cb805d64fe 100644
--- a/test/.eslintrc
+++ b/test/.eslintrc
@@ -19,6 +19,7 @@
     "react/jsx-quotes": 0,
     "react/no-multi-comp": 0,
     "react/prop-types": 0,
+    "space-before-function-paren": 0,
     "mocha/no-exclusive-tests": 2
   }
 }
diff --git a/test/AlertSpec.js b/test/AlertSpec.js
index 93cb445098..3ae4288647 100644
--- a/test/AlertSpec.js
+++ b/test/AlertSpec.js
@@ -2,8 +2,8 @@ import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
 import Alert from '../src/Alert';
 
-describe('Alert', function () {
-  it('Should output a alert with message', function () {
+describe('Alert', function() {
+  it('Should output a alert with message', function() {
     let instance = ReactTestUtils.renderIntoDocument(
       <Alert>
         <strong>Message</strong>
@@ -12,7 +12,7 @@ describe('Alert', function () {
     assert.ok(ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'strong'));
   });
 
-  it('Should have bsType by default', function () {
+  it('Should have bsType by default', function() {
     let instance = ReactTestUtils.renderIntoDocument(
       <Alert>
         Message
@@ -21,8 +21,8 @@ describe('Alert', function () {
     assert.ok(React.findDOMNode(instance).className.match(/\balert\b/));
   });
 
-  it('Should have dismissable style with onDismiss', function () {
-    let noOp = function () {};
+  it('Should have dismissable style with onDismiss', function() {
+    let noOp = function() {};
     let instance = ReactTestUtils.renderIntoDocument(
       <Alert onDismiss={noOp}>
         Message
@@ -31,8 +31,8 @@ describe('Alert', function () {
     assert.ok(React.findDOMNode(instance).className.match(/\balert-dismissable\b/));
   });
 
-  it('Should call onDismiss callback on dismiss click', function (done) {
-    let doneOp = function () {
+  it('Should call onDismiss callback on dismiss click', function(done) {
+    let doneOp = function() {
       done();
     };
     let instance = ReactTestUtils.renderIntoDocument(
@@ -43,8 +43,8 @@ describe('Alert', function () {
     ReactTestUtils.Simulate.click(React.findDOMNode(instance).children[0]);
   });
 
-  it('Should call onDismiss callback on dismissAfter time', function (done) {
-    let doneOp = function () {
+  it('Should call onDismiss callback on dismissAfter time', function(done) {
+    let doneOp = function() {
       done();
     };
     ReactTestUtils.renderIntoDocument(
@@ -54,7 +54,7 @@ describe('Alert', function () {
     );
   });
 
-  it('Should have a default bsStyle class', function () {
+  it('Should have a default bsStyle class', function() {
     let instance = ReactTestUtils.renderIntoDocument(
       <Alert>
         Message
@@ -63,7 +63,7 @@ describe('Alert', function () {
     assert.ok(React.findDOMNode(instance).className.match(/\balert-\w+\b/));
   });
 
-  it('Should have use bsStyle class', function () {
+  it('Should have use bsStyle class', function() {
     let instance = ReactTestUtils.renderIntoDocument(
       <Alert bsStyle='danger'>
         Message
@@ -72,8 +72,8 @@ describe('Alert', function () {
     assert.ok(React.findDOMNode(instance).className.match(/\balert-danger\b/));
   });
 
-  describe('Web Accessibility', function(){
-    it('Should have alert role', function () {
+  describe('Web Accessibility', function() {
+    it('Should have alert role', function() {
       let instance = ReactTestUtils.renderIntoDocument(
         <Alert>Message</Alert>
       );
@@ -82,7 +82,7 @@ describe('Alert', function () {
     });
 
     it('Should call onDismiss callback when the sr-only dismiss link is activated', function(done) {
-      let doneOp = function () {
+      let doneOp = function() {
         done();
       };
       let instance = ReactTestUtils.renderIntoDocument(
diff --git a/test/ButtonInputSpec.js b/test/ButtonInputSpec.js
index f2934fd79c..7492a4e3dd 100644
--- a/test/ButtonInputSpec.js
+++ b/test/ButtonInputSpec.js
@@ -3,7 +3,7 @@ import ReactTestUtils from 'react/lib/ReactTestUtils';
 import ButtonInput from '../src/ButtonInput';
 import {shouldWarn} from './helpers';
 
-describe('ButtonInput', () =>{
+describe('ButtonInput', () => {
   it('renders an input button element with type=button', function () {
     const instance = ReactTestUtils.renderIntoDocument(
       <ButtonInput value="button" bsStyle="danger" wrapperClassName="test" />
diff --git a/test/CollapseSpec.js b/test/CollapseSpec.js
index 8b7f71509c..1b71b2b619 100644
--- a/test/CollapseSpec.js
+++ b/test/CollapseSpec.js
@@ -6,10 +6,10 @@ describe('Collapse', function () {
 
   let Component, instance;
 
-  beforeEach(function(){
+  beforeEach(function() {
 
     Component = React.createClass({
-      render(){
+      render() {
         let { children, ...props } = this.props;
 
         return (
@@ -39,7 +39,7 @@ describe('Collapse', function () {
   });
 
 
-  describe('collapsed', function(){
+  describe('collapsed', function() {
 
     it('Should have collapse class', function () {
       instance = ReactTestUtils.renderIntoDocument(
@@ -50,10 +50,10 @@ describe('Collapse', function () {
     });
   });
 
-  describe('from collapsed to expanded', function(){
+  describe('from collapsed to expanded', function() {
     let scrollHeightStub;
 
-    beforeEach(function(){
+    beforeEach(function() {
       instance = ReactTestUtils.renderIntoDocument(
         <Component>Panel content</Component>
       );
@@ -75,7 +75,7 @@ describe('Collapse', function () {
     it('Should set initial 0px height', function (done) {
       let node = React.findDOMNode(instance);
 
-      function onEnter(){
+      function onEnter() {
         assert.equal(node.style.height, '0px');
         done();
       }
@@ -97,7 +97,7 @@ describe('Collapse', function () {
     it('Should transition from collapsing to not collapsing', function (done) {
       let node = React.findDOMNode(instance);
 
-      function onEntered(){
+      function onEntered() {
         assert.equal(node.className, 'collapse in');
         done();
       }
@@ -110,7 +110,7 @@ describe('Collapse', function () {
     it('Should clear height after transition complete', function (done) {
       let node = React.findDOMNode(instance);
 
-      function onEntered(){
+      function onEntered() {
         assert.equal(node.style.height, '');
         done();
       }
@@ -122,8 +122,8 @@ describe('Collapse', function () {
     });
   });
 
-  describe('from expanded to collapsed', function(){
-    beforeEach(function(){
+  describe('from expanded to collapsed', function() {
+    beforeEach(function() {
       instance = ReactTestUtils.renderIntoDocument(
         <Component in>Panel content</Component>
       );
@@ -138,7 +138,7 @@ describe('Collapse', function () {
     it('Should set initial height', function () {
       let node = React.findDOMNode(instance);
 
-      function onExit(){
+      function onExit() {
         assert.equal(node.style.height, '15px');
       }
 
@@ -157,7 +157,7 @@ describe('Collapse', function () {
     it('Should transition from collapsing to not collapsing', function (done) {
       let node = React.findDOMNode(instance);
 
-      function onExited(){
+      function onExited() {
         assert.equal(node.className, 'collapse');
         done();
       }
@@ -170,7 +170,7 @@ describe('Collapse', function () {
     it('Should have 0px height after transition complete', function (done) {
       let node = React.findDOMNode(instance);
 
-      function onExited(){
+      function onExited() {
         assert.ok(node.style.height === '0px');
         done();
       }
@@ -181,7 +181,7 @@ describe('Collapse', function () {
     });
   });
 
-  describe('expanded', function(){
+  describe('expanded', function() {
 
     it('Should have collapse and in class', function () {
       instance = ReactTestUtils.renderIntoDocument(
@@ -191,20 +191,20 @@ describe('Collapse', function () {
     });
   });
 
-  describe('dimension', function(){
-    beforeEach(function(){
+  describe('dimension', function() {
+    beforeEach(function() {
       instance = ReactTestUtils.renderIntoDocument(
         <Component>Panel content</Component>
       );
     });
 
-    it('Defaults to height', function(){
+    it('Defaults to height', function() {
       assert.equal(instance.collapse._dimension(), 'height');
     });
 
-    it('Uses getCollapsibleDimension if exists', function(){
+    it('Uses getCollapsibleDimension if exists', function() {
 
-      function dimension(){
+      function dimension() {
         return 'whatevs';
       }
 
@@ -215,7 +215,7 @@ describe('Collapse', function () {
   });
 
   describe('with a role', function() {
-    beforeEach(function(){
+    beforeEach(function() {
       instance = ReactTestUtils.renderIntoDocument(
         <Component role="note">Panel content</Component>
       );
diff --git a/test/CollapsibleMixinSpec.js b/test/CollapsibleMixinSpec.js
index c38527d2ae..e26dbaaf0a 100644
--- a/test/CollapsibleMixinSpec.js
+++ b/test/CollapsibleMixinSpec.js
@@ -7,19 +7,19 @@ describe('CollapsibleMixin', function () {
 
   let Component, instance;
 
-  beforeEach(function(){
+  beforeEach(function() {
     Component = React.createClass({
       mixins: [CollapsibleMixin],
 
-      getCollapsibleDOMNode(){
+      getCollapsibleDOMNode() {
         return React.findDOMNode(this.refs.panel);
       },
 
-      getCollapsibleDimensionValue(){
+      getCollapsibleDimensionValue() {
         return 15;
       },
 
-      render(){
+      render() {
         let styles = this.getCollapsibleClassSet();
         return (
           <div>
@@ -33,12 +33,12 @@ describe('CollapsibleMixin', function () {
   });
 
   afterEach(()=> {
-    if (console.warn.calledWithMatch('CollapsibleMixin is deprecated')){
+    if (console.warn.calledWithMatch('CollapsibleMixin is deprecated')) {
       console.warn.reset();
     }
   });
 
-  describe('getInitialState', function(){
+  describe('getInitialState', function() {
     it('Should check defaultExpanded', function () {
       instance = ReactTestUtils.renderIntoDocument(
         <Component defaultExpanded>Panel content</Component>
@@ -56,7 +56,7 @@ describe('CollapsibleMixin', function () {
     });
   });
 
-  describe('collapsed', function(){
+  describe('collapsed', function() {
     it('Should have collapse class', function () {
       instance = ReactTestUtils.renderIntoDocument(
         <Component>Panel content</Component>
@@ -65,8 +65,8 @@ describe('CollapsibleMixin', function () {
     });
   });
 
-  describe('from collapsed to expanded', function(){
-    beforeEach(function(){
+  describe('from collapsed to expanded', function() {
+    beforeEach(function() {
       instance = ReactTestUtils.renderIntoDocument(
         <Component>Panel content</Component>
       );
@@ -82,7 +82,7 @@ describe('CollapsibleMixin', function () {
       let node = instance.getCollapsibleDOMNode();
       assert.equal(node.style.height, '');
 
-      instance._afterWillUpdate = function(){
+      instance._afterWillUpdate = function() {
         assert.equal(node.style.height, '0px');
       };
 
@@ -98,8 +98,8 @@ describe('CollapsibleMixin', function () {
     });
 
     it('Should transition from collapsing to not collapsing', function (done) {
-      instance._addEndEventListener = function(node, complete){
-        setTimeout(function(){
+      instance._addEndEventListener = function(node, complete) {
+        setTimeout(function() {
           complete();
           assert.ok(!instance.state.collapsing);
           done();
@@ -112,8 +112,8 @@ describe('CollapsibleMixin', function () {
     it('Should clear height after transition complete', function (done) {
       let node = instance.getCollapsibleDOMNode();
 
-      instance._addEndEventListener = function(nodeInner, complete){
-        setTimeout(function(){
+      instance._addEndEventListener = function(nodeInner, complete) {
+        setTimeout(function() {
           complete();
           assert.equal(nodeInner.style.height, '');
           done();
@@ -126,8 +126,8 @@ describe('CollapsibleMixin', function () {
     });
   });
 
-  describe('from expanded to collapsed', function(){
-    beforeEach(function(){
+  describe('from expanded to collapsed', function() {
+    beforeEach(function() {
       instance = ReactTestUtils.renderIntoDocument(
         <Component defaultExpanded>Panel content</Component>
       );
@@ -142,7 +142,7 @@ describe('CollapsibleMixin', function () {
     it('Should set initial height', function () {
       let node = instance.getCollapsibleDOMNode();
 
-      instance._afterWillUpdate = function(){
+      instance._afterWillUpdate = function() {
         assert.equal(node.style.height, '15px');
       };
 
@@ -159,8 +159,8 @@ describe('CollapsibleMixin', function () {
     });
 
     it('Should transition from collapsing to not collapsing', function (done) {
-      instance._addEndEventListener = function(node, complete){
-        setTimeout(function(){
+      instance._addEndEventListener = function(node, complete) {
+        setTimeout(function() {
           complete();
           assert.ok(!instance.state.collapsing);
           done();
@@ -173,8 +173,8 @@ describe('CollapsibleMixin', function () {
     it('Should have 0px height after transition complete', function (done) {
       let node = instance.getCollapsibleDOMNode();
 
-      instance._addEndEventListener = function(nodeInner, complete){
-        setTimeout(function(){
+      instance._addEndEventListener = function(nodeInner, complete) {
+        setTimeout(function() {
           complete();
           assert.ok(nodeInner.style.height === '0px');
           done();
@@ -187,7 +187,7 @@ describe('CollapsibleMixin', function () {
     });
   });
 
-  describe('expanded', function(){
+  describe('expanded', function() {
     it('Should have collapse and in class', function () {
       instance = ReactTestUtils.renderIntoDocument(
         <Component expanded={true}>Panel content</Component>
@@ -203,19 +203,19 @@ describe('CollapsibleMixin', function () {
     });
   });
 
-  describe('dimension', function(){
-    beforeEach(function(){
+  describe('dimension', function() {
+    beforeEach(function() {
       instance = ReactTestUtils.renderIntoDocument(
         <Component>Panel content</Component>
       );
     });
 
-    it('Defaults to height', function(){
+    it('Defaults to height', function() {
       assert.equal(instance.dimension(), 'height');
     });
 
-    it('Uses getCollapsibleDimension if exists', function(){
-      instance.getCollapsibleDimension = function(){
+    it('Uses getCollapsibleDimension if exists', function() {
+      instance.getCollapsibleDimension = function() {
         return 'whatevs';
       };
       assert.equal(instance.dimension(), 'whatevs');
diff --git a/test/DropdownSpec.js b/test/DropdownSpec.js
index db1efb64b2..91cf2f17bd 100644
--- a/test/DropdownSpec.js
+++ b/test/DropdownSpec.js
@@ -278,7 +278,7 @@ describe('Dropdown', function() {
             </button>
             <Dropdown
               open={this.state.open}
-              onToggle={()=>{}}
+              onToggle={() => {}}
               title='Prop open control'
               id='test-id'
             >
diff --git a/test/FadeMixinSpec.js b/test/FadeMixinSpec.js
index 7e6086dd0f..471efc671d 100644
--- a/test/FadeMixinSpec.js
+++ b/test/FadeMixinSpec.js
@@ -20,7 +20,7 @@ describe('FadeMixin', function () {
   });
 
   afterEach(()=> {
-    if (console.warn.calledWithMatch('FadeMixin is deprecated')){
+    if (console.warn.calledWithMatch('FadeMixin is deprecated')) {
       console.warn.reset();
     }
   });
@@ -31,7 +31,7 @@ describe('FadeMixin', function () {
 
     let child = ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'span');
 
-    setTimeout(function(){
+    setTimeout(function() {
       assert.ok(React.findDOMNode(instance).className.match(/\bin\b/));
       assert.ok(React.findDOMNode(instance).className.match(/\bfade\b/));
       assert.ok(React.findDOMNode(child).className.match(/\bin\b/));
@@ -43,7 +43,7 @@ describe('FadeMixin', function () {
   it('Should remove the in class for all elements', function (done) {
     let instance = ReactTestUtils.renderIntoDocument(<Component />);
 
-    setTimeout(function(){
+    setTimeout(function() {
 
       instance.componentWillUnmount();
       let element = instance._fadeOutEl.children[0];
@@ -52,7 +52,7 @@ describe('FadeMixin', function () {
       assert.ok(element.className.match(/\bin\b/));
       assert.ok(child.className.match(/\bin\b/));
 
-      setTimeout(function(){
+      setTimeout(function() {
         assert.ok(!element.className.match(/\bin\b/));
         assert.ok(element.className.match(/\bfade\b/));
         assert.ok(!child.className.match(/\bin\b/));
diff --git a/test/FadeSpec.js b/test/FadeSpec.js
index 0f85fdfd40..c6217c3f6c 100644
--- a/test/FadeSpec.js
+++ b/test/FadeSpec.js
@@ -6,10 +6,10 @@ describe('Fade', function () {
 
   let Component, instance;
 
-  beforeEach(function(){
+  beforeEach(function() {
 
     Component = React.createClass({
-      render(){
+      render() {
         let { children, ...props } = this.props;
 
         return (
@@ -52,7 +52,7 @@ describe('Fade', function () {
       <Component>Panel content</Component>
     );
 
-    function onEntering(){
+    function onEntering() {
       assert.equal(React.findDOMNode(instance).className, 'fade in');
       done();
     }
@@ -68,7 +68,7 @@ describe('Fade', function () {
       <Component in>Panel content</Component>
     );
 
-    function onExiting(){
+    function onExiting() {
       assert.equal(React.findDOMNode(instance).className, 'fade');
       done();
     }
diff --git a/test/MenuItemSpec.js b/test/MenuItemSpec.js
index f1c5c0f223..4dca3af484 100644
--- a/test/MenuItemSpec.js
+++ b/test/MenuItemSpec.js
@@ -80,7 +80,7 @@ describe('MenuItem', function() {
   });
 
   it('does not fire onSelect when divider is clicked', function() {
-    const handleSelect = (event, selectedEvent) => {
+    const handleSelect = () => {
       throw new Error('Should not invoke onSelect with divider flag applied');
     };
     const instance = ReactTestUtils.renderIntoDocument(
@@ -93,7 +93,7 @@ describe('MenuItem', function() {
   });
 
   it('does not fire onSelect when header is clicked', function() {
-    const handleSelect = (event, selectedEvent) => {
+    const handleSelect = () => {
       throw new Error('Should not invoke onSelect with divider flag applied');
     };
     const instance = ReactTestUtils.renderIntoDocument(
@@ -106,7 +106,7 @@ describe('MenuItem', function() {
   });
 
   it('disabled link', function() {
-    const handleSelect = (event, selectEvent) => {
+    const handleSelect = () => {
       throw new Error('Should not invoke onSelect event');
     };
     const instance = ReactTestUtils.renderIntoDocument(
diff --git a/test/ModalSpec.js b/test/ModalSpec.js
index 9d5ceb0178..aab9fd9db1 100644
--- a/test/ModalSpec.js
+++ b/test/ModalSpec.js
@@ -6,7 +6,7 @@ import { render, shouldWarn } from './helpers';
 describe('Modal', function () {
   let mountPoint;
 
-  beforeEach(()=>{
+  beforeEach(() => {
     mountPoint = document.createElement('div');
     document.body.appendChild(mountPoint);
   });
@@ -65,7 +65,7 @@ describe('Modal', function () {
 
     ReactTestUtils.Simulate.click(backdrop);
 
-    setTimeout(function(){
+    setTimeout(function() {
       assert.equal(React.findDOMNode(instance).className.length, 0);
       done();
     }, 0);
@@ -203,7 +203,7 @@ describe('Modal', function () {
     let noOp = function () {};
 
     class CustomDialog {
-      render(){ return <div {...this.props}/>; }
+      render() { return <div {...this.props}/>; }
     }
 
     let instance = render(
@@ -221,7 +221,7 @@ describe('Modal', function () {
 
     let instance = render(
       <Modal show
-        onHide={()=>{}}
+        onHide={() => {}}
         onExit={increment}
         onExiting={increment}
         onExited={()=> {
@@ -260,7 +260,7 @@ describe('Modal', function () {
   describe('Focused state', function () {
     let focusableContainer = null;
 
-    beforeEach(()=>{
+    beforeEach(() => {
       focusableContainer = document.createElement('div');
       focusableContainer.tabIndex = 0;
       document.body.appendChild(focusableContainer);
@@ -277,7 +277,7 @@ describe('Modal', function () {
       document.activeElement.should.equal(focusableContainer);
 
       let instance = render(
-        <Modal show onHide={()=>{}} animation={false}>
+        <Modal show onHide={() => {}} animation={false}>
           <strong>Message</strong>
         </Modal>
         , focusableContainer);
@@ -292,7 +292,7 @@ describe('Modal', function () {
 
     it('Should not focus on the Modal when autoFocus is false', function () {
       render(
-        <Modal show autoFocus={false} onHide={()=>{}} animation={false}>
+        <Modal show autoFocus={false} onHide={() => {}} animation={false}>
           <strong>Message</strong>
         </Modal>
         , focusableContainer);
@@ -305,7 +305,7 @@ describe('Modal', function () {
       document.activeElement.should.equal(focusableContainer);
 
       render(
-        <Modal show onHide={()=>{}} animation={false}>
+        <Modal show onHide={() => {}} animation={false}>
           <input autoFocus />
         </Modal>
         , focusableContainer);
diff --git a/test/NavDropdownSpec.js b/test/NavDropdownSpec.js
index e70ec453cc..b30bdbdd87 100644
--- a/test/NavDropdownSpec.js
+++ b/test/NavDropdownSpec.js
@@ -42,7 +42,7 @@ describe('NavDropdown', function() {
             </button>
             <NavDropdown
               open={this.state.open}
-              onToggle={()=>{}}
+              onToggle={() => {}}
               title='Prop open control'
               id='test-id'>
               <MenuItem eventKey='1'>Item 1</MenuItem>
diff --git a/test/NavItemSpec.js b/test/NavItemSpec.js
index a7f6ffb6a1..6e665be08c 100644
--- a/test/NavItemSpec.js
+++ b/test/NavItemSpec.js
@@ -107,7 +107,7 @@ describe('NavItem', function () {
     assert.equal(linkElement.outerHTML.match('role="button"'), null);
   });
 
-  describe('Web Accessibility', function(){
+  describe('Web Accessibility', function() {
 
     it('Should pass aria-controls to the link', function () {
       let instance = ReactTestUtils.renderIntoDocument(
diff --git a/test/NavSpec.js b/test/NavSpec.js
index a86f47e0dc..d1d94cb03f 100644
--- a/test/NavSpec.js
+++ b/test/NavSpec.js
@@ -178,7 +178,7 @@ describe('Nav', function () {
   });
 
 
-  describe('Web Accessibility', function(){
+  describe('Web Accessibility', function() {
 
     it('Should have tablist and tab roles', function () {
       let instance = ReactTestUtils.renderIntoDocument(
diff --git a/test/OverlayDeprecationSpec.js b/test/OverlayDeprecationSpec.js
index c8eb2f03f7..abcbdc998b 100644
--- a/test/OverlayDeprecationSpec.js
+++ b/test/OverlayDeprecationSpec.js
@@ -6,21 +6,21 @@ import Portal from '../src/Portal';
 
 import { shouldWarn } from './helpers';
 
-describe('Components moved to react-overlays', ()=>{
+describe('Components moved to react-overlays', () => {
 
-  it('should warn about Position', ()=>{
+  it('should warn about Position', () => {
     ReactTestUtils.renderIntoDocument(<Position><div/></Position>);
 
     shouldWarn(/Position component is deprecated/);
   });
 
-  it('should warn about Transition', ()=>{
+  it('should warn about Transition', () => {
     ReactTestUtils.renderIntoDocument(<Transition><div/></Transition>);
 
     shouldWarn(/Transition component is deprecated/);
   });
 
-  it('should warn about Portal', ()=>{
+  it('should warn about Portal', () => {
     ReactTestUtils.renderIntoDocument(<Portal><div/></Portal>);
 
     shouldWarn(/Portal component is deprecated/);
diff --git a/test/OverlayTriggerSpec.js b/test/OverlayTriggerSpec.js
index c50e73dc38..960d6322a0 100644
--- a/test/OverlayTriggerSpec.js
+++ b/test/OverlayTriggerSpec.js
@@ -80,7 +80,7 @@ describe('OverlayTrigger', function() {
       <OverlayTrigger
         trigger='click'
         overlay={<div>test</div>}
-        onHide={()=>{}}
+        onHide={() => {}}
         onExit={increment}
         onExiting={increment}
         onExited={()=> {
diff --git a/test/PanelSpec.js b/test/PanelSpec.js
index 0c9cfc09f1..ff1b9daf30 100644
--- a/test/PanelSpec.js
+++ b/test/PanelSpec.js
@@ -185,7 +185,7 @@ describe('Panel', function () {
     assert.notOk(children[0].className.match(/\bpanel-body\b/));
   });
 
-  describe('Web Accessibility', function(){
+  describe('Web Accessibility', function() {
 
     it('Should be aria-expanded=true', function () {
       let instance = ReactTestUtils.renderIntoDocument(
diff --git a/test/SafeAnchorSpec.js b/test/SafeAnchorSpec.js
index 2271c2fbbe..2b5bf8487f 100644
--- a/test/SafeAnchorSpec.js
+++ b/test/SafeAnchorSpec.js
@@ -32,7 +32,7 @@ describe('SafeAnchor', function() {
   });
 
   it('forwards onClick handler', function(done) {
-    const handleClick = (event) => {
+    const handleClick = () => {
       done();
     };
     const instance = ReactTestUtils.renderIntoDocument(<SafeAnchor onClick={handleClick} />);
diff --git a/test/TabSpec.js b/test/TabSpec.js
index 6babd9db32..a38279015a 100644
--- a/test/TabSpec.js
+++ b/test/TabSpec.js
@@ -17,7 +17,7 @@ describe('Tab', function () {
     assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'active'));
   });
 
-  describe('Web Accessibility', function(){
+  describe('Web Accessibility', function() {
 
     it('Should have aria-hidden', function () {
       let instance = ReactTestUtils.renderIntoDocument(
diff --git a/test/TabsSpec.js b/test/TabsSpec.js
index ed7f875c84..5745fb9bdc 100644
--- a/test/TabsSpec.js
+++ b/test/TabsSpec.js
@@ -390,7 +390,7 @@ describe('Tabs', function () {
   describe('animation', function () {
     let mountPoint;
 
-    beforeEach(()=>{
+    beforeEach(() => {
       mountPoint = document.createElement('div');
       document.body.appendChild(mountPoint);
     });
@@ -429,9 +429,9 @@ describe('Tabs', function () {
     checkTabRemovingWithAnimation(false);
   });
 
-  describe('Web Accessibility', function(){
+  describe('Web Accessibility', function() {
     let instance;
-    beforeEach(function(){
+    beforeEach(function() {
       instance = ReactTestUtils.renderIntoDocument(
         <Tabs defaultActiveKey={2} id='tabs'>
           <Tab id='pane-1' title="Tab 1" eventKey={1}>Tab 1 content</Tab>
diff --git a/test/helpers.js b/test/helpers.js
index 9df659ecae..81611a55d8 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -14,7 +14,7 @@ export function shouldWarn(about) {
  * @param  {HTMLElement?} mountPoint  Optional mount node, when empty it uses an unattached div like `renderIntoDocument()`
  * @return {ComponentInstance}        The instance, with a new method `renderWithProps` which will return a new instance with updated props
  */
-export function render(element, mountPoint){
+export function render(element, mountPoint) {
   let mount = mountPoint || document.createElement('div');
   let instance = React.render(element, mount);
 
diff --git a/test/utils/CustomPropTypesSpec.js b/test/utils/CustomPropTypesSpec.js
index 92e542b366..643f02ffb9 100644
--- a/test/utils/CustomPropTypesSpec.js
+++ b/test/utils/CustomPropTypesSpec.js
@@ -48,7 +48,7 @@ describe('CustomPropTypes', function() {
 
     it('Should validate OK with elementType values', function() {
       assert.isUndefined(validate('span'));
-      assert.isUndefined(validate(function(){}));
+      assert.isUndefined(validate(function() {}));
     });
 
     it('Should return error with not a string or function values', function() {
diff --git a/tools/buildBabel.js b/tools/buildBabel.js
index 54ea1bba7a..d19a0e4497 100644
--- a/tools/buildBabel.js
+++ b/tools/buildBabel.js
@@ -13,7 +13,7 @@ export function buildContent(content, filename, destination, babelOptions = {})
 export function buildFile(filename, destination, babelOptions = {}) {
   const content = fs.readFileSync(filename, {encoding: 'utf8'});
   // We only have .js files that we need to build
-  if(path.extname(filename) === '.js') {
+  if (path.extname(filename) === '.js') {
     const outputPath = path.join(destination, path.basename(filename));
     // console.log('%s => %s', filename, outputPath);
     buildContent(content, filename, outputPath, babelOptions);
@@ -23,9 +23,9 @@ export function buildFile(filename, destination, babelOptions = {}) {
 export function buildFolder(folderPath, destination, babelOptions = {}, firstFolder = true) {
   let stats = fs.statSync(folderPath);
 
-  if(stats.isFile()) {
+  if (stats.isFile()) {
     buildFile(folderPath, destination, babelOptions);
-  } else if(stats.isDirectory()) {
+  } else if (stats.isDirectory()) {
     let outputPath = firstFolder ? destination : path.join(destination, path.basename(folderPath));
     let files = fs.readdirSync(folderPath).map(file => path.join(folderPath, file));
     files.forEach(filename => buildFolder(filename, outputPath, babelOptions, false));
diff --git a/tools/promisify.js b/tools/promisify.js
index e3098ab499..5e2d123036 100644
--- a/tools/promisify.js
+++ b/tools/promisify.js
@@ -1,7 +1,7 @@
-export default function promisify(fn){
-  return function (...args){
-    return new Promise(function(resolve, reject){
-      function finish(err, result){
+export default function promisify(fn) {
+  return function(...args) {
+    return new Promise(function(resolve, reject) {
+      function finish(err, result) {
         if (err) {
           return reject(err);
         }
diff --git a/tools/public-components.js b/tools/public-components.js
index 67fc67f0c7..c54836e550 100644
--- a/tools/public-components.js
+++ b/tools/public-components.js
@@ -2,7 +2,7 @@ import React from 'react';
 import * as index from '../src/index';
 
 let components = [];
-Object.keys(index).forEach(function (item) {
+Object.keys(index).forEach(function(item) {
   if (index[item] instanceof React.Component.constructor) {
     components.push(item);
   }
diff --git a/webpack.config.js b/webpack.config.js
index 9d7bf6d0f3..faf8e55ad8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,4 +1,4 @@
-/* eslint no-var: 0 */
+/* eslint no-var: 0, vars-on-top: 0 */
 require('babel/register');
 var config = require('./webpack/webpack.config');
 module.exports = config;
diff --git a/webpack.docs.js b/webpack.docs.js
index 80f0eec6fe..dc6139decf 100644
--- a/webpack.docs.js
+++ b/webpack.docs.js
@@ -1,4 +1,4 @@
-/* eslint no-var: 0 */
+/* eslint no-var: 0, vars-on-top: 0 */
 require('babel/register');
 var config = require('./webpack/docs.config');
 module.exports = config;