Refactor _bundle.js