General cleanup for JSHint issues