Corrected code sniffer issues