exo refactor