more animation conversion work
mostly refactoring
animations: refactoring
animations: cleaning up