Refactor animator helper out