Fix codesniffer errors