app init refactoring continued