fix minor code quality issues and imports#44

matthi4s merged 2 commits intomasteraternosorg/php-model:masterfrom

code-quality-importsaternosorg/php-model:code-quality-importsCopy head branch name to clipboard