tidied up imports in index.js