jshint stuff fixed