PHPCS cleanup
PHPCS updates
PHPCS updates
Don't instantiate object twice