Update Anmator class - cleanup