Fixed code sniffer problems