Fix phpcs issues
Merge pull request #1 from faishal/master

Fix phpcs issues