pulling out stub content, changing indentation
cleanup app init stuff
app refactoring, making benign