Clarification and cleanup in the Keyword model