Final style cop fixes