Code Cleaning for CodeSniffer