refactor some of runs