Refactor animations structure

Removes all the ifs.