Improved look and feel of keyword removal.  Clean up.