Refactoring of runner