Keyword cleanup