a few more index.js tidy ups