refact app-runner