Refactored app.