Improved comments and use the private app_injector variable where passible