Refactored animation calling routines.
Ordered functions to reflect semantic meaning.