Fixed all PHP_CodeSniffer issues