Code Cleanup + AnimTree update