Refactoring and completion..