Some more JS style fixes
Merge remote-tracking branch 'origin/master' into sql_improvements