Refactoring of runtime.