PHPCS cleanup

Should fix the majority of the PHPCS errors (note doesn't deal with line length warnings and some of the DI container stuff)