refactorings after changes in Experiment