Further JS cleanup
Merge in changes from `review-js`