Fix code sniffer issues