Cleanup, Animations working correctly