Minor improvements and refactoring of Animation model.