Improved code completer