Fix CodeSniffer errors