Refactor animator