Fix issues raised in pull-request
JS conding conventions