First attempt at cleaning up the Keyword Manager