User proper angular DI syntax; more minor formatting updates