App.js refactor