Major tweaks for JSHint