Fix issues reported by PHP_CodeSniffer