Fix CodeSniffers complaints