Cleanup some code sniffer problems