App class refactor