Refactoring: created App object