Additional refactoring.
Animation model is nearly cleaned up.