smoother timeline and clean up