Fix code smells in code climate

[mostafamaklad]

Description

Fix code smells in code climate

How has this been tested?

composer test

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• I have read the CONTRIBUTING document.
• My pull request addresses exactly one patch/feature.
• I have created a branch for this patch/feature.
• Each individual commit in the pull request is meaningful.
• I have added tests to cover my changes.
• If my change requires a change to the documentation, I have updated it accordingly.

If you're unsure about any of these, don't hesitate to ask. We're here to help!

[coveralls]

Coverage decreased (-0.01%) to 99.451% when pulling 4dbe81b on v1.7 into b8bfbfd on master.