fix issues with new an animator and improve code

[finchen]

I found few issues with my changes. It was not always calling the function that dispatch to legacy animation or new animation. fixed Plus improve code

[OpenHogwarts]

Now it looks even more cleaner :o P.S: You now have Collaborator privileges ;)