Refactoring repairs