WIP - Fix JSHint