Fix a couple of minor style nits

- Make line wrapping on declaration of logger consistent
- Declare injected constructor parameters on separate lines

Change-Id: I37ba7afe17b4e902b418f5c0f4a48d0f47767b76