Fix CodeSniff complains