refactor(animation): some cleanup / refactoring

A PR I did submit to @codelogic own repo... but his own PR got merge quickly and this didn't get a chance to be merged before.