Refactor completer