Cleanup style cop violations