Fixed code sniffer warnings