Update JSHint
Fix expressions
Fix functions in expressions
Cleanup