repairs, refactorings