diff --git a/components/date_picker/DatePicker.js b/components/date_picker/DatePicker.js
index def5ab16..7ca0dcf4 100644
--- a/components/date_picker/DatePicker.js
+++ b/components/date_picker/DatePicker.js
@@ -11,6 +11,10 @@ class DatePicker extends React.Component {
     autoOk: React.PropTypes.bool,
     className: React.PropTypes.string,
     error: React.PropTypes.string,
+    icon: React.PropTypes.oneOfType([
+      React.PropTypes.string,
+      React.PropTypes.element
+    ]),
     inputClassName: React.PropTypes.string,
     inputFormat: React.PropTypes.func,
     label: React.PropTypes.string,
@@ -20,10 +24,6 @@ class DatePicker extends React.Component {
     value: React.PropTypes.oneOfType([
       React.PropTypes.instanceOf(Date),
       React.PropTypes.string
-    ]),
-    icon: React.PropTypes.oneOfType([
-      React.PropTypes.string,
-      React.PropTypes.element
     ])
   };
 
diff --git a/components/table/Table.js b/components/table/Table.js
index 8ced4366..18bd5092 100644
--- a/components/table/Table.js
+++ b/components/table/Table.js
@@ -8,10 +8,10 @@ class Table extends React.Component {
     className: React.PropTypes.string,
     heading: React.PropTypes.bool,
     model: React.PropTypes.object,
+    multiSelectable: React.PropTypes.bool,
     onChange: React.PropTypes.func,
     onSelect: React.PropTypes.func,
     selectable: React.PropTypes.bool,
-    multiSelectable: React.PropTypes.bool,
     selected: React.PropTypes.array,
     source: React.PropTypes.array
   };
@@ -37,11 +37,8 @@ class Table extends React.Component {
     if (this.props.onSelect) {
       const position = this.props.selected.indexOf(index);
       let newSelected = [...this.props.selected];
-
-      if (position !== -1) {
-        newSelected.splice(position, 1);
-      }
-      else if (this.props.multiSelectable) {
+      if (position !== -1) { newSelected.splice(position, 1); }
+      if (position !== -1 && this.props.multiSelectable) {
         newSelected.push(index);
       } else {
         newSelected = [index];
@@ -56,7 +53,7 @@ class Table extends React.Component {
     }
   };
 
-  renderHead() {
+  renderHead () {
     if (this.props.heading) {
       const {model, selected, source, selectable, multiSelectable} = this.props;
       const isSelected = selected.length === source.length;
@@ -72,7 +69,7 @@ class Table extends React.Component {
     }
   }
 
-  renderBody() {
+  renderBody () {
     const rows = this.props.source.map((data, index) => {
       return (
         <TableRow
@@ -91,7 +88,7 @@ class Table extends React.Component {
     return <tbody>{rows}</tbody>;
   }
 
-  render() {
+  render () {
     let className = style.root;
     if (this.props.className) className += ` ${this.props.className}`;
     return (