Fixed pointer issue and cleaned up animation