More animations tidy ups