Refactor runtime related items