Refactor runnables