Fix style cop rule
Fix more style cop rules
Fix even more style cop rules
Style cop changes