Address JSHint issues