Tried to clean up a bit of the code sniffer problems