Trying to make animating better, cleaning up the code