Refactored app
Refactored app