Fix the issues reported by phpcs

Worked on the issue and fixed the remaining PHPCS errors.