refactoring/correction/completion