Merge jsHint clean-up