Fix Code Sniff - too many errors before