Fixing some phpcs errors