Working !
Fixed jshint warnings