Continue JS Refactor.