Refactoring of RedGeneController and Animator