Refactor of runner