Js refactor resolved

Resolved!