negligible refactor to js
negligible refactor to js