Refactored address entry and index.js