Fix coding standards

This fixes all of the coding standards issues identified except 2:

---------------------------------------------------------------------------------------------
FOUND 0 ERRORS AND 2 WARNINGS AFFECTING 2 LINES
---------------------------------------------------------------------------------------------
 33 | WARNING | \Drupal calls should be avoided in classes, use dependency injection instead
 39 | WARNING | \Drupal calls should be avoided in classes, use dependency injection instead
---------------------------------------------------------------------------------------------

I think dependency injection can be a separate issue than other coding standard fixes because DI can sometimes cause problems, so it should be a separate commit.