Addressed jshint issues