diff --git a/lib/SimpleRadioButton.js b/lib/SimpleRadioButton.js
index ebc0fd2..6ad0f1c 100644
--- a/lib/SimpleRadioButton.js
+++ b/lib/SimpleRadioButton.js
@@ -1,9 +1,9 @@
-'use strict'
+"use strict";
 
-import Style from './Style.js'
+import Style from "./Style.js";
 
-var React = require('react')
-var ReactNative = require('react-native')
+var React = require("react");
+var ReactNative = require("react-native");
 var {
   Text,
   View,
@@ -12,83 +12,96 @@ var {
   LayoutAnimation,
   Platform,
   UIManager
-} = ReactNative
+} = ReactNative;
 
 export default class RadioForm extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
       is_active_index: props.initial
-    }
-    if (Platform.OS === 'android') {
-      UIManager.setLayoutAnimationEnabledExperimental && UIManager.setLayoutAnimationEnabledExperimental(true);
-    }
+    };
     this._renderButton = this._renderButton.bind(this);
   }
   static defaultProps = {
     radio_props: [],
     initial: 0,
-    buttonColor: '#2196f3',
-    selectedButtonColor: '#2196f3',
+    buttonColor: "#2196f3",
+    selectedButtonColor: "#2196f3",
     formHorizontal: false,
     labelHorizontal: true,
     animation: true,
-    labelColor: '#000',
-    selectedLabelColor: '#000',
+    labelColor: "#000",
+    selectedLabelColor: "#000",
     wrapStyle: {},
     disabled: false
-  }
+  };
 
   updateIsActiveIndex(index) {
     this.setState({ is_active_index: index });
-    this.props.onPress(this.props.radio_props[index], index)
+    this.props.onPress(this.props.radio_props[index], index);
   }
 
   _renderButton(obj, i) {
     return (
       <RadioButton
         accessible={this.props.accessible}
-        accessibilityLabel={(this.props.accessibilityLabel)
-          ? (this.props.accessibilityLabel + '|' + i) : ('radioButton' + '|' + i)}
-        testID={(this.props.testID)
-          ? (this.props.testID + '|' + i) : ('radioButton' + '|' + i)}
+        accessibilityLabel={
+          this.props.accessibilityLabel
+            ? this.props.accessibilityLabel + "|" + i
+            : "radioButton" + "|" + i
+        }
+        testID={
+          this.props.testID
+            ? this.props.testID + "|" + i
+            : "radioButton" + "|" + i
+        }
         isSelected={this.state.is_active_index === i}
         obj={obj}
         key={i}
         index={i}
-        buttonColor={this.state.is_active_index === i ? this.props.selectedButtonColor : this.props.buttonColor}
+        buttonColor={
+          this.state.is_active_index === i
+            ? this.props.selectedButtonColor
+            : this.props.buttonColor
+        }
         buttonSize={this.props.buttonSize}
         buttonOuterSize={this.props.buttonOuterSize}
         labelHorizontal={this.props.labelHorizontal}
-        labelColor={this.state.is_active_index === i ? this.props.selectedLabelColor : this.props.labelColor}
+        labelColor={
+          this.state.is_active_index === i
+            ? this.props.selectedLabelColor
+            : this.props.labelColor
+        }
         labelStyle={this.props.labelStyle}
         style={this.props.radioStyle}
         animation={this.props.animation}
         disabled={this.props.disabled}
         onPress={(value, index) => {
-          this.props.onPress(value, index)
-          this.setState({is_active_index: index})
+          this.props.onPress(value, index);
+          this.setState({ is_active_index: index });
         }}
       />
-    )
+    );
   }
 
   render() {
-    var render_content = false
+    var render_content = false;
     if (this.props.radio_props.length) {
-      render_content = this.props.radio_props.map(this._renderButton)
+      render_content = this.props.radio_props.map(this._renderButton);
     } else {
-      render_content = this.props.children
+      render_content = this.props.children;
     }
     return (
-      <View style={[
-        Style.radioFrom,
-        this.props.style,
-        this.props.formHorizontal && Style.formHorizontal
-      ]}>
+      <View
+        style={[
+          Style.radioFrom,
+          this.props.style,
+          this.props.formHorizontal && Style.formHorizontal
+        ]}
+      >
         {render_content}
       </View>
-    )
+    );
   }
 }
 
@@ -98,185 +111,216 @@ export class RadioButton extends React.Component {
     this.state = {};
   }
   shouldComponentUpdate(nextProps, nextState) {
-    return true
+    return true;
   }
   static defaultProps = {
     isSelected: false,
-    buttonColor: '#2196f3',
-    selectedButtonColor: '#2196f3',
+    buttonColor: "#2196f3",
+    selectedButtonColor: "#2196f3",
     labelHorizontal: true,
     disabled: false,
-    idSeparator: '|'
-  }
-  componentWillUpdate () {
+    idSeparator: "|"
+  };
+  componentWillUpdate() {
     if (this.props.animation) {
-      LayoutAnimation.spring()
+      LayoutAnimation.spring();
     }
   }
-  render () {
-    var c = this.props.children
+  render() {
+    var c = this.props.children;
 
-    var idSeparator = (this.props.idSeparator) ? this.props.idSeparator : '|'
-    var idSeparatorAccessibilityLabelIndex = (this.props.accessibilityLabel)
-    ? this.props.accessibilityLabel.indexOf(idSeparator) : -1
-    var idSeparatorTestIdIndex = (this.props.testID)
-    ? this.props.testID.indexOf(idSeparator) : -1
+    var idSeparator = this.props.idSeparator ? this.props.idSeparator : "|";
+    var idSeparatorAccessibilityLabelIndex = this.props.accessibilityLabel
+      ? this.props.accessibilityLabel.indexOf(idSeparator)
+      : -1;
+    var idSeparatorTestIdIndex = this.props.testID
+      ? this.props.testID.indexOf(idSeparator)
+      : -1;
 
-    var accessibilityLabel = (this.props.accessibilityLabel)
-    ? (idSeparatorAccessibilityLabelIndex !== -1
-    ? this.props.accessibilityLabel.substring(0, idSeparatorAccessibilityLabelIndex) : this.props.accessibilityLabel) : 'radioButton'
-    var testID = (this.props.testID)
-    ? (idSeparatorTestIdIndex !== -1
-    ? this.props.testID.substring(0, idSeparatorTestIdIndex) : this.props.testID) : 'radioButton'
+    var accessibilityLabel = this.props.accessibilityLabel
+      ? idSeparatorAccessibilityLabelIndex !== -1
+        ? this.props.accessibilityLabel.substring(
+            0,
+            idSeparatorAccessibilityLabelIndex
+          )
+        : this.props.accessibilityLabel
+      : "radioButton";
+    var testID = this.props.testID
+      ? idSeparatorTestIdIndex !== -1
+        ? this.props.testID.substring(0, idSeparatorTestIdIndex)
+        : this.props.testID
+      : "radioButton";
 
-    var accessibilityLabelIndex = (this.props.accessibilityLabel && idSeparatorAccessibilityLabelIndex !== -1)
-    ? this.props.accessibilityLabel.substring(idSeparatorAccessibilityLabelIndex + 1) : ''
-    var testIDIndex = (this.props.testID && testIDIndex !== -1)
-    ? this.props.testID.split(testIDIndex + 1) : ''
+    var accessibilityLabelIndex =
+      this.props.accessibilityLabel && idSeparatorAccessibilityLabelIndex !== -1
+        ? this.props.accessibilityLabel.substring(
+            idSeparatorAccessibilityLabelIndex + 1
+          )
+        : "";
+    var testIDIndex =
+      this.props.testID && testIDIndex !== -1
+        ? this.props.testID.split(testIDIndex + 1)
+        : "";
 
-    var renderContent = false
+    var renderContent = false;
     renderContent = c ? (
-      <View style={[
-        Style.radioWrap,
-        this.props.style,
-        !this.props.labelHorizontal && Style.labelVerticalWrap
-      ]}>
+      <View
+        style={[
+          Style.radioWrap,
+          this.props.style,
+          !this.props.labelHorizontal && Style.labelVerticalWrap
+        ]}
+      >
         {c}
       </View>
     ) : (
-      <View style={[
-        Style.radioWrap,
-        this.props.style,
-        !this.props.labelHorizontal && Style.labelVerticalWrap
-      ]}>
-        <RadioButtonInput {...this.props}
-          accessibilityLabel={accessibilityLabel + 'Input' + accessibilityLabelIndex}
-          testID={testID + 'Input' + testIDIndex} />
-        <RadioButtonLabel {...this.props}
-          accessibilityLabel={accessibilityLabel + 'Label' + accessibilityLabelIndex}
-          testID={testID + 'Label' + testIDIndex} />
+      <View
+        style={[
+          Style.radioWrap,
+          this.props.style,
+          !this.props.labelHorizontal && Style.labelVerticalWrap
+        ]}
+      >
+        <RadioButtonInput
+          {...this.props}
+          accessibilityLabel={
+            accessibilityLabel + "Input" + accessibilityLabelIndex
+          }
+          testID={testID + "Input" + testIDIndex}
+        />
+        <RadioButtonLabel
+          {...this.props}
+          accessibilityLabel={
+            accessibilityLabel + "Label" + accessibilityLabelIndex
+          }
+          testID={testID + "Label" + testIDIndex}
+        />
       </View>
-    )
-    return (
-      <View style={this.props.wrapStyle}>
-        {renderContent}
-      </View>
-    )
+    );
+    return <View style={this.props.wrapStyle}>{renderContent}</View>;
   }
 }
 
 export class RadioButtonInput extends React.Component {
-  constructor (props) {
-    super(props)
+  constructor(props) {
+    super(props);
     this.state = {
       isSelected: false,
-      buttonColor: props.buttonColor || '#2196f3'
-    }
+      buttonColor: props.buttonColor || "#2196f3"
+    };
   }
-  render () {
-    var innerSize = {width: 20, height:20, borderRadius: 20/2 }
-    var outerSize = {width: 20+10, height:20+10, borderRadius: (20+10)/2 }
+  render() {
+    var innerSize = { width: 20, height: 20, borderRadius: 20 / 2 };
+    var outerSize = {
+      width: 20 + 10,
+      height: 20 + 10,
+      borderRadius: (20 + 10) / 2
+    };
     if (this.props.buttonSize) {
-      innerSize.width = this.props.buttonSize
-      innerSize.height = this.props.buttonSize
-      innerSize.borderRadius = this.props.buttonSize /2
-      outerSize.width = this.props.buttonSize + 10
-      outerSize.height = this.props.buttonSize + 10
-      outerSize.borderRadius = (this.props.buttonSize + 10) / 2
+      innerSize.width = this.props.buttonSize;
+      innerSize.height = this.props.buttonSize;
+      innerSize.borderRadius = this.props.buttonSize / 2;
+      outerSize.width = this.props.buttonSize + 10;
+      outerSize.height = this.props.buttonSize + 10;
+      outerSize.borderRadius = (this.props.buttonSize + 10) / 2;
     }
     if (this.props.buttonOuterSize) {
-      outerSize.width = this.props.buttonOuterSize
-      outerSize.height = this.props.buttonOuterSize
-      outerSize.borderRadius = this.props.buttonOuterSize / 2
+      outerSize.width = this.props.buttonOuterSize;
+      outerSize.height = this.props.buttonOuterSize;
+      outerSize.borderRadius = this.props.buttonOuterSize / 2;
     }
-    var outerColor = this.props.buttonOuterColor
-    var borderWidth = this.props.borderWidth || 3
-    var innerColor = this.props.buttonInnerColor
+    var outerColor = this.props.buttonOuterColor;
+    var borderWidth = this.props.borderWidth || 3;
+    var innerColor = this.props.buttonInnerColor;
     if (this.props.buttonColor) {
-      outerColor = this.props.buttonColor
-      innerColor = this.props.buttonColor
+      outerColor = this.props.buttonColor;
+      innerColor = this.props.buttonColor;
     }
     var c = (
-      <View style={[
-        Style.radioNormal,
-        this.props.isSelected && Style.radioActive,
-        this.props.isSelected && innerSize,
-        this.props.isSelected && {backgroundColor:innerColor}
-      ]}></View>
-    )
+      <View
+        style={[
+          Style.radioNormal,
+          this.props.isSelected && Style.radioActive,
+          this.props.isSelected && innerSize,
+          this.props.isSelected && { backgroundColor: innerColor }
+        ]}
+      />
+    );
     var radioStyle = [
       Style.radio,
       {
-        borderColor:outerColor,
-        borderWidth:borderWidth
+        borderColor: outerColor,
+        borderWidth: borderWidth
       },
       this.props.buttonStyle,
       outerSize
-    ]
+    ];
 
     if (this.props.disabled) {
       return (
-        <View style={this.props.buttonWrapStyle} >
-          <View style={radioStyle}>
-            {c}
-          </View>
+        <View style={this.props.buttonWrapStyle}>
+          <View style={radioStyle}>{c}</View>
         </View>
-      )
+      );
     }
 
     return (
-      <View style={this.props.buttonWrapStyle} >
+      <View style={this.props.buttonWrapStyle}>
         <TouchableOpacity
           accessible={this.props.accessible}
           accessibilityLabel={this.props.accessibilityLabel}
           testID={this.props.testID}
           style={radioStyle}
-          onPress={() => { this.props.onPress( this.props.obj.value, this.props.index) }
-          }>
-         {c}
+          onPress={() => {
+            this.props.onPress(this.props.obj.value, this.props.index);
+          }}
+        >
+          {c}
         </TouchableOpacity>
       </View>
-    )
+    );
   }
 }
 
 RadioButtonInput.defaultProps = {
-  buttonInnerColor: '#2196f3',
-  buttonOuterColor: '#2196f3',
+  buttonInnerColor: "#2196f3",
+  buttonOuterColor: "#2196f3",
   disabled: false
-}
+};
 
 export class RadioButtonLabel extends React.Component {
-  constructor (props) {
-    super(props)
+  constructor(props) {
+    super(props);
     this.state = {
       isSelected: false,
-      buttonColor: '#2196f3',
-    }
+      buttonColor: "#2196f3"
+    };
   }
-  render () {
+  render() {
     return (
       <TouchableWithoutFeedback
         accessible={this.props.accessible}
         accessibilityLabel={this.props.accessibilityLabel}
         testID={this.props.testID}
         onPress={() => {
-        if (!this.props.disabled) {
-          this.props.onPress( this.props.obj.value, this.props.index)}
-        }
-      }>
-        <View style={[
-          this.props.labelWrapStyle,
-          Style.labelWrapStyle,
-        ]} >
-          <Text style={[
-            Style.radioLabel,
-            !this.props.labelHorizontal && Style.labelVertical,
-            {color: this.props.labelColor},
-            this.props.labelStyle
-          ]}>{this.props.obj.label}</Text>
+          if (!this.props.disabled) {
+            this.props.onPress(this.props.obj.value, this.props.index);
+          }
+        }}
+      >
+        <View style={[this.props.labelWrapStyle, Style.labelWrapStyle]}>
+          <Text
+            style={[
+              Style.radioLabel,
+              !this.props.labelHorizontal && Style.labelVertical,
+              { color: this.props.labelColor },
+              this.props.labelStyle
+            ]}
+          >
+            {this.props.obj.label}
+          </Text>
         </View>
       </TouchableWithoutFeedback>
-    )
+    );
   }
 }