Cleaned up phpcs issues