App class refactoring