refactor completions