VP-243 Minor refactoring
Merge pull request #270 from dlu-gs/feature/vp-243-js-merging

VP-243 Minor refactoring