cleanup + animation changes