Indentation and readability fixes in app-module