Tried to clean up a bit of the code sniffer problems

I did not fix all.