fix style cop and just code errors