some changes after refactorings in experiments
formatter update