Style changes and better deletion.