Fix code sniffer errors