code formatting
callback after animation completed
Merge