Add style cop, update code