Fixed codesniffer stuff
Various codesniffer fixes