Fixing codesniffer issues