refactor(animation): some cleanup / refactoring

Closes #660