Fix Style cop errors