Refactor complete (runnable)