Code simplification
App is now a class