Tidied up animation and timing