CLC-4495 - Fix Javascript style issues