Reset Animations Improved & Refactor