Close #39

* Fixed line 30
 	* Changed `i` to `value`
 * Fixed line 57
  	* Changed `i` to `index`
* Removed extra ()s
* Added `?`s