Code Sniffer Fix