Improve the code using Typechecking with [PropType](https://facebook.github.io/react/docs/typechecking-with-proptypes.html)
