Refactoring, first autocomplete operations.