Minor code changes, coding standards.

I have fixed some more PHP_CodeSniffer issues in @_shy MR and checked for any unused variable.

I have reviewed it, and the error seems to have been resolved. I am attaching a screenshot for reference. Moving it to RTBC.