Enhance Animation. # Step 3

Do refactor.