orbit refactor