Address most JSHint complaints