Some code cleanup and added a timeout function to force none animating animations to callback