Javascript tidying
Merge remote-tracking branch 'origin/feature/tidyhaptical4d' into feature/tidyhaptical4d