Clean up PHPCS Suggestions
Merge pull request #254 from dongilbert/phpcs

Clean up PHPCS Suggestions