Minor cleanup and index.js removal.