CompletionWords: simplify the code