Fixed remaing JSHint issues