Remerged changes from Alex to index.js . all refactoring/ readability changes