Code Sniffer fixes