Cleaned up animation structure