Tidying up animations a bit