Minor cleanup
Refactored app