Missed a checkin and also cleanup some jshint issues