runtime refactor