Improve app.js and app.json