general code clean up around the usage of the animation classes