Updated .jshintrc
Some code cleaning for efficiency
Removed unused variable
Merge branch 'develop'