finalize Keyword component refactoring